--- parser3/src/main/compile.tab.C 2002/12/06 17:27:35 1.78 +++ parser3/src/main/compile.tab.C 2003/01/30 14:59:44 1.81.2.2 @@ -40,10 +40,10 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.78 2002/12/06 17:27:35 paf Exp $ + $Id: compile.tab.C,v 1.81.2.2 2003/01/30 14:59:44 paf Exp $ */ /** @@ -57,7 +57,7 @@ -#: in iis make up specialized Pool object for that */ -#define YYSTYPE Array/**/ * +#define YYSTYPE ArrayOperationPtr #define YYPARSE_PARAM pc #define YYLEX_PARAM pc #define YYDEBUG 1 @@ -210,22 +210,22 @@ static const short yyrhs[] = { 62, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 115, 125, 127, 127, 128, 130, 130, 132, 199, 199, - 200, 200, 201, 202, 202, 204, 233, 233, 234, 235, - 235, 236, 236, 238, 238, 242, 242, 244, 244, 245, - 245, 246, 246, 246, 250, 257, 258, 258, 259, 260, - 262, 263, 285, 286, 286, 290, 294, 296, 297, 298, - 315, 320, 322, 324, 325, 327, 333, 341, 347, 349, - 350, 352, 358, 359, 359, 363, 369, 372, 375, 388, - 390, 390, 391, 393, 394, 396, 397, 398, 399, 401, - 403, 405, 407, 409, 411, 415, 419, 423, 425, 426, - 428, 437, 437, 439, 439, 440, 441, 449, 454, 456, - 458, 459, 460, 462, 466, 475, 481, 486, 486, 487, - 492, 494, 496, 508, 520, 525, 527, 528, 529, 530, - 531, 533, 534, 535, 536, 537, 538, 539, 540, 542, - 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, - 553, 554, 555, 556, 557, 558, 559, 560, 561, 562, - 563, 564, 565, 566, 567, 568, 571, 580, 585, 586 + 115, 123, 125, 125, 126, 128, 128, 130, 195, 195, + 196, 196, 197, 198, 198, 200, 229, 229, 230, 231, + 231, 232, 232, 234, 234, 238, 238, 240, 240, 241, + 241, 242, 242, 242, 246, 253, 254, 254, 255, 256, + 258, 259, 281, 282, 282, 286, 290, 292, 293, 294, + 311, 316, 318, 320, 321, 323, 329, 337, 343, 345, + 346, 348, 354, 355, 355, 359, 365, 368, 371, 384, + 386, 386, 387, 389, 390, 392, 393, 394, 395, 397, + 399, 401, 403, 405, 407, 411, 415, 419, 421, 422, + 424, 433, 433, 435, 435, 436, 437, 445, 450, 452, + 454, 455, 456, 458, 462, 471, 477, 482, 482, 483, + 488, 490, 492, 504, 516, 521, 523, 524, 525, 526, + 527, 529, 530, 531, 532, 533, 534, 535, 536, 538, + 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, + 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, + 559, 560, 561, 562, 563, 564, 567, 576, 581, 582 }; #endif @@ -1034,78 +1034,74 @@ yyreduce: case 1: #line 116 "compile.y" { - Method& method=*NEW Method(POOL, - PC.request->main_method_name, - Method::CT_ANY, + MethodPtr method(new Method(main_method_name, Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ - 0/*param_names*/, 0/*local_names*/, - yyvsp[0]/*parser_code*/, 0/*native_code*/); - PC.cclass->add_method(PC.request->main_method_name, method); + ArrayConstStringPtr(0)/*param_names*/, ArrayConstStringPtr(0)/*local_names*/, + yyvsp[0]/*parser_code*/, 0/*native_code*/)); + PC.cclass->add_method(main_method_name, method); ; break;} case 8: -#line 133 "compile.y" +#line 131 "compile.y" { - const String& command=*LA2S(yyvsp[-2]); + ConstStringPtr command=LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; - if(strings_code->size()<1*2) { + if(strings_code->count()<1*2) { strcpy(PC.error, "@"); - strcat(PC.error, command.cstr()); + strcat(PC.error, command->cstr()); strcat(PC.error, " is empty"); YYERROR; } - if(command==CLASS_NAME) { + if(*command==CLASS_NAME) { if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a name '"); - strncat(PC.error, PC.cclass->name().cstr(), 100); + strncat(PC.error, PC.cclass->name()->cstr(), 100); strcat(PC.error, "'"); YYERROR; } - if(strings_code->size()==1*2) { + if(strings_code->count()==1*2) { // new class' name - const String *name=LA2S(strings_code); + ConstStringPtr name=LA2S(*strings_code); // creating the class - PC.cclass=NEW VClass(POOL); - PC.cclass->set_name(*name); + PC.cclass=VStateless_classPtr(new VClass); + PC.cclass->set_name(name); // append to request's classes - PC.request->classes().put(*name, PC.cclass); + PC.request->classes().put(name, PC.cclass); } else { strcpy(PC.error, "@"CLASS_NAME" must contain sole name"); YYERROR; } - } else if(command==USE_CONTROL_METHOD_NAME) { - for(int i=0; isize(); i+=2) - PC.request->use_file(PC.request->main_class, *LA2S(strings_code, i)); - } else if(command==BASE_NAME) { + } else if(*command==USE_CONTROL_METHOD_NAME) { + for(int i=0; icount(); i+=2) + PC.request->use_file(PC.request->main_class, LA2S(*strings_code, i)); + } else if(*command==BASE_NAME) { if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a base '"); - strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100); + strncat(PC.error, PC.cclass->base_class()->name()->cstr(), 100); strcat(PC.error, "'"); YYERROR; } - if(strings_code->size()==1*2) { - const String& base_name=*LA2S(strings_code); - Value *vbase_class=static_cast( - PC.request->classes().get(base_name)); - VStateless_class *base_class=vbase_class?vbase_class->get_class():0; - if(!base_class) { - strcpy(PC.error, base_name.cstr()); + if(strings_code->count()==1*2) { + ConstStringPtr base_name=LA2S(*strings_code); + if(VStateless_classPtr base_class=PC.request->classes().get(base_name)) { + // @CLASS == @BASE sanity check + if(PC.cclass.get()==base_class.get()) { + strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); + YYERROR; + } + PC.cclass->set_base(base_class); + } else { + strcpy(PC.error, base_name->cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } - // @CLASS == @BASE sanity check - if(PC.cclass==base_class) { - strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); - YYERROR; - } - PC.cclass->set_base(base_class); } else { strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; } } else { strcpy(PC.error, "'"); - strncat(PC.error, command.cstr(), MAX_STRING/2); + strncat(PC.error, command->cstr(), MAX_STRING/2); strcat(PC.error, "' invalid special name. valid names are " "'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'"); YYERROR; @@ -1113,557 +1109,557 @@ case 8: ; break;} case 12: -#line 200 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 196 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 16: -#line 205 "compile.y" +#line 201 "compile.y" { - const String *name=LA2S(yyvsp[-5]); + ConstStringPtr name=LA2S(*yyvsp[-5]); YYSTYPE params_names_code=yyvsp[-4]; - Array *params_names=0; - if(int size=params_names_code->size()) { - params_names=NEW Array(POOL); + ArrayConstStringPtr params_names; + if(int size=params_names_code->count()) { + params_names=ArrayConstStringPtr(new ArrayConstString); for(int i=0; isize()) { - locals_names=NEW Array(POOL); + ArrayConstStringPtr locals_names; + if(int size=locals_names_code->count()) { + locals_names=ArrayConstStringPtr(new ArrayConstString); for(int i=0; iadd_method(*name, method); + yyvsp[0], 0)); + PC.cclass->add_method(name, method); ; break;} case 19: -#line 234 "compile.y" +#line 230 "compile.y" {yyval=yyvsp[-1]; break;} case 23: -#line 236 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +#line 232 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 29: -#line 244 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 240 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 35: -#line 250 "compile.y" +#line 246 "compile.y" { yyval=yyvsp[0]; /* stack: resulting value */ - changetail_or_append(yyval, + changetail_or_append(*yyval, OP_GET_ELEMENT, false, /*->*/OP_GET_ELEMENT__WRITE, /*or */OP_WRITE_VALUE ); /* value=pop; wcontext.write(value) */ ; break;} case 36: -#line 257 "compile.y" +#line 253 "compile.y" { yyval=yyvsp[0] ; break;} case 39: -#line 259 "compile.y" +#line 255 "compile.y" { yyval=yyvsp[-1] ; break;} case 42: -#line 263 "compile.y" +#line 259 "compile.y" { - yyval=N(POOL); - Array *diving_code=yyvsp[0]; - const String *first_name=LA2S(diving_code); + yyval=N(); + ArrayOperationPtr diving_code=yyvsp[0]; + ConstStringPtr first_name=LA2S(*diving_code); // self.xxx... -> xxx... // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { - O(yyval, OP_WITH_SELF); /* stack: starting context */ - P(yyval, diving_code, + O(*yyval, OP_WITH_SELF); /* stack: starting context */ + P(*yyval, *diving_code, /* skip over... */ - diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); + diving_code->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - O(yyval, OP_WITH_READ); /* stack: starting context */ + O(*yyval, OP_WITH_READ); /* stack: starting context */ // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR // OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR. - if(PC.in_call_value && diving_code->size()==3) - diving_code->put_int(2, OP_GET_ELEMENT_OR_OPERATOR); - P(yyval, diving_code); + if(PC.in_call_value && diving_code->count()==3) + (*diving_code)[2].code=OP_GET_ELEMENT_OR_OPERATOR; + P(*yyval, *diving_code); } /* diving code; stack: current context */ ; break;} case 43: -#line 285 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 281 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 45: -#line 286 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 282 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 46: -#line 290 "compile.y" +#line 286 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ - P(yyval, yyvsp[0]); /* stack: context,name,constructor_value */ + P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} case 50: -#line 298 "compile.y" +#line 294 "compile.y" { - yyval=N(POOL); - Array *diving_code=yyvsp[0]; - const String *first_name=LA2S(diving_code); + yyval=N(); + ArrayOperationPtr diving_code=yyvsp[0]; + ConstStringPtr first_name=LA2S(*diving_code); // $self.xxx... -> $xxx... // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { - O(yyval, OP_WITH_SELF); /* stack: starting context */ - P(yyval, diving_code, + O(*yyval, OP_WITH_SELF); /* stack: starting context */ + P(*yyval, *diving_code, /* skip over... */ - diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); + diving_code->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - O(yyval, OP_WITH_ROOT); /* stack: starting context */ - P(yyval, diving_code); + O(*yyval, OP_WITH_ROOT); /* stack: starting context */ + P(*yyval, *diving_code); } /* diving code; stack: current context */ ; break;} case 51: -#line 315 "compile.y" +#line 311 "compile.y" { - yyval=N(POOL); - O(yyval, OP_WITH_WRITE); /* stack: starting context */ - P(yyval, yyvsp[0]); /* diving code; stack: context,name */ + yyval=N(); + O(*yyval, OP_WITH_WRITE); /* stack: starting context */ + P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */ ; break;} case 52: -#line 320 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 316 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 56: -#line 327 "compile.y" +#line 323 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value - O(yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ ; break;} case 57: -#line 333 "compile.y" +#line 329 "compile.y" { - yyval=N(POOL); - O(yyval, OP_PREPARE_TO_EXPRESSION); + yyval=N(); + O(*yyval, OP_PREPARE_TO_EXPRESSION); // stack: context, name - P(yyval, yyvsp[-1]); // stack: context, name, value - O(yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ + P(*yyval, *yyvsp[-1]); // stack: context, name, value + O(*yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ ; break;} case 58: -#line 341 "compile.y" +#line 337 "compile.y" { // stack: context, name - yyval=N(POOL); - OA(yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ + yyval=N(); + OA(*yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ ; break;} case 62: -#line 352 "compile.y" +#line 348 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ + yyval=N(); + OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ; break;} case 65: -#line 359 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 355 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 66: -#line 363 "compile.y" +#line 359 "compile.y" { yyval=yyvsp[0]; /* stack: value */ - changetail_or_append(yyval, + changetail_or_append(*yyval, OP_CALL, true, /*->*/ OP_CALL__WRITE, /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ ; break;} case 67: -#line 369 "compile.y" +#line 365 "compile.y" { PC.in_call_value=true; ; break;} case 68: -#line 372 "compile.y" +#line 368 "compile.y" { PC.in_call_value=false; ; break;} case 69: -#line 375 "compile.y" +#line 371 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ YYSTYPE params_code=yyvsp[-1]; - if(params_code->size()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] - if(Value *value=LA2V(params_code)) // it is OP_VALUE + value? + if(params_code->count()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] + if(ValuePtr value=LA2V(*params_code)) // it is OP_VALUE + value? if(!value->is_defined()) // value is VVoid? - params_code=0; // ^zzz[] case. don't append lone empty param. + params_code=YYSTYPE(0); // ^zzz[] case. don't append lone empty param. } /* stack: context, method_junction */ - OA(yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + OA(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value ; break;} case 72: -#line 390 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 386 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 76: -#line 396 "compile.y" +#line 392 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 397 "compile.y" +#line 393 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 398 "compile.y" +#line 394 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 401 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +#line 397 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 82: -#line 405 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +#line 401 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 84: -#line 409 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; +#line 405 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 85: -#line 411 "compile.y" +#line 407 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_STORE_PARAM); + O(*yyval, OP_STORE_PARAM); ; break;} case 86: -#line 415 "compile.y" +#line 411 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); + yyval=N(); + OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 87: -#line 419 "compile.y" +#line 415 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); + yyval=N(); + OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 91: -#line 428 "compile.y" +#line 424 "compile.y" { - yyval=N(POOL); - O(yyval, OP_PREPARE_TO_EXPRESSION); - P(yyval, yyvsp[0]); - O(yyval, OP_WRITE_EXPR_RESULT); + yyval=N(); + O(*yyval, OP_PREPARE_TO_EXPRESSION); + P(*yyval, *yyvsp[0]); + O(*yyval, OP_WRITE_EXPR_RESULT); ; break;} case 93: -#line 437 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 433 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 95: -#line 439 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 435 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 97: -#line 441 "compile.y" +#line 437 "compile.y" { // we know that name_advance1 not called from ^xxx context // so we'll not check for operator call possibility as we do in name_advance2 /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} case 98: -#line 449 "compile.y" +#line 445 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} case 104: -#line 462 "compile.y" +#line 458 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_GET_ELEMENT); + O(*yyval, OP_GET_ELEMENT); ; break;} case 105: -#line 466 "compile.y" +#line 462 "compile.y" { - Array *code; + ArrayOperationPtr code; { - change_string_literal_to_write_string_literal(code=yyvsp[-1]); - P(code, yyvsp[0]); + change_string_literal_to_write_string_literal(*(code=yyvsp[-1])); + P(*code, *yyvsp[0]); } - yyval=N(POOL); - OA(yyval, OP_STRING_POOL, code); + yyval=N(); + OA(*yyval, OP_STRING_POOL, code); ; break;} case 106: -#line 475 "compile.y" +#line 471 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ + yyval=N(); + OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ; break;} case 107: -#line 481 "compile.y" +#line 477 "compile.y" { - yyval=N(POOL); - O(yyval, OP_WITH_READ); - P(yyval, yyvsp[0]); + yyval=N(); + O(*yyval, OP_WITH_READ); + P(*yyval, *yyvsp[0]); ; break;} case 109: -#line 486 "compile.y" -{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; +#line 482 "compile.y" +{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 110: -#line 487 "compile.y" +#line 483 "compile.y" { yyval=yyvsp[0]; - O(yyval, OP_GET_ELEMENT__WRITE); + O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} case 113: -#line 496 "compile.y" +#line 492 "compile.y" { yyval=yyvsp[-1]; // stack: class name string - if(*LA2S(yyval) == BASE_NAME) { // pseude BASE class - if(VStateless_class *base=PC.cclass->base_class()) { - change_string_literal_value(yyval, base->name()); + if(*LA2S(*yyval) == BASE_NAME) { // pseude BASE class + if(VStateless_classPtr base=PC.cclass->base_class()) { + change_string_literal_value(*yyval, base->name()); } else { strcpy(PC.error, "no base class declared"); YYERROR; } } - O(yyval, OP_GET_CLASS); + O(*yyval, OP_GET_CLASS); ; break;} case 114: -#line 508 "compile.y" +#line 504 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { strcpy(PC.error, ":: not allowed here"); YYERROR; } - O(yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); + O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} case 115: -#line 520 "compile.y" +#line 516 "compile.y" { // see OP_PREPARE_TO_EXPRESSION!! - if((yyval=yyvsp[0])->size()==2) // only one string literal in there? - change_string_literal_to_double_literal(yyval); // make that string literal Double + if((yyval=yyvsp[0])->count()==2) // only one string literal in there? + change_string_literal_to_double_literal(*yyval); // make that string literal Double ; break;} case 119: -#line 529 "compile.y" +#line 525 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 530 "compile.y" +#line 526 "compile.y" { yyval = yyvsp[-1]; ; break;} case 121: -#line 531 "compile.y" +#line 527 "compile.y" { yyval = yyvsp[-1]; ; break;} case 122: -#line 533 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NEG) ; +#line 529 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} case 123: -#line 534 "compile.y" +#line 530 "compile.y" { yyval=yyvsp[0] ; break;} case 124: -#line 535 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_INV) ; +#line 531 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} case 125: -#line 536 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_NOT) ; +#line 532 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} case 126: -#line 537 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEF) ; +#line 533 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} case 127: -#line 538 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_IN) ; +#line 534 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} case 128: -#line 539 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; +#line 535 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} case 129: -#line 540 "compile.y" -{ yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; +#line 536 "compile.y" +{ yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} case 130: -#line 542 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; +#line 538 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} case 131: -#line 543 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; +#line 539 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} case 132: -#line 544 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; +#line 540 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} case 133: -#line 545 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; +#line 541 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} case 134: -#line 546 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; +#line 542 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} case 135: -#line 547 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_INTDIV) ; +#line 543 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} case 136: -#line 548 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SL) ; +#line 544 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} case 137: -#line 549 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SR) ; +#line 545 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} case 138: -#line 550 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; +#line 546 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} case 139: -#line 551 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; +#line 547 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} case 140: -#line 552 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; +#line 548 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} case 141: -#line 553 "compile.y" -{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_AND) ; +#line 549 "compile.y" +{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} case 142: -#line 554 "compile.y" -{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_OR) ; +#line 550 "compile.y" +{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} case 143: -#line 555 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; +#line 551 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} case 144: -#line 556 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; +#line 552 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} case 145: -#line 557 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; +#line 553 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} case 146: -#line 558 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; +#line 554 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} case 147: -#line 559 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; +#line 555 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} case 148: -#line 560 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; +#line 556 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} case 149: -#line 561 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; +#line 557 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} case 150: -#line 562 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; +#line 558 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} case 151: -#line 563 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; +#line 559 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} case 152: -#line 564 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; +#line 560 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} case 153: -#line 565 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; +#line 561 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} case 154: -#line 566 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; +#line 562 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} case 155: -#line 567 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; +#line 563 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} case 156: -#line 568 "compile.y" -{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; +#line 564 "compile.y" +{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} case 157: -#line 571 "compile.y" +#line 567 "compile.y" { - yyval=N(POOL); - OA(yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ + yyval=N(); + OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ ; break;} case 158: -#line 580 "compile.y" +#line 576 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE - change_string_literal_to_write_string_literal(yyval=yyvsp[0]) + change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) ; break;} case 159: -#line 585 "compile.y" -{ yyval=VL(NEW VVoid(POOL)) ; +#line 581 "compile.y" +{ yyval=VL(ValuePtr(new VVoid())) ; break;} case 160: -#line 586 "compile.y" -{ yyval=N(POOL) ; +#line 582 "compile.y" +{ yyval=N() ; break;} } /* the action file gets copied in in place of this dollarsign */ @@ -1887,7 +1883,7 @@ yyerrhandle: } return 1; } -#line 588 "compile.y" +#line 584 "compile.y" #endif @@ -2602,9 +2598,9 @@ break2: } if(PC.string->size()) { // something accumulated? // create STRING value: array of OP_VALUE+vstring - *lvalp=VL(NEW VString(*PC.string)); + *lvalp=VL(ValuePtr(new VString(PC.string))); // new pieces storage - PC.string=NEW String(POOL); + PC.string=StringPtr(new String); // make current result be pending for next call, return STRING for now PC.pending_state=result; result=STRING; } @@ -2621,5 +2617,5 @@ static int real_yyerror(parse_control *p static void yyprint(FILE *file, int type, YYSTYPE value) { if(type==STRING) - fprintf(file, " \"%s\"", LA2S(value)->cstr()); + fprintf(file, " \"%s\"", LA2S(*value)->cstr()); }