--- parser3/src/main/compile.tab.C 2003/03/11 14:58:32 1.81.2.10 +++ parser3/src/main/compile.tab.C 2003/03/24 15:08:02 1.81.2.13.2.11 @@ -43,7 +43,7 @@ Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.81.2.10 2003/03/11 14:58:32 paf Exp $ + $Id: compile.tab.C,v 1.81.2.13.2.11 2003/03/24 15:08:02 paf Exp $ */ /** @@ -57,7 +57,7 @@ -#: in iis make up specialized Pool object for that */ -#define YYSTYPE ArrayOperationPtr +#define YYSTYPE ArrayOperation* #define YYPARSE_PARAM pc #define YYLEX_PARAM pc #define YYDEBUG 1 @@ -82,7 +82,9 @@ static int yylex(YYSTYPE *lvalp, void *p // local convinient inplace typecast & var +#undef PC #define PC (*(parse_control *)pc) +#undef POOL #define POOL (*PC.pool) #ifndef DOXYGEN #ifndef YYSTYPE @@ -208,22 +210,22 @@ static const short yyrhs[] = { 62, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 113, 121, 123, 123, 124, 126, 126, 128, 200, 200, - 201, 201, 202, 203, 203, 205, 234, 234, 235, 236, - 236, 237, 237, 239, 239, 243, 243, 245, 245, 246, - 246, 247, 247, 247, 251, 258, 259, 259, 260, 261, - 263, 264, 286, 287, 287, 291, 295, 297, 298, 299, - 316, 321, 323, 325, 326, 328, 334, 342, 348, 350, - 351, 353, 359, 360, 360, 364, 370, 373, 376, 389, - 391, 391, 392, 394, 395, 397, 398, 399, 400, 402, - 404, 406, 408, 410, 412, 416, 420, 424, 426, 427, - 429, 438, 438, 440, 440, 441, 442, 450, 455, 457, - 459, 460, 461, 463, 467, 476, 482, 487, 487, 488, - 493, 495, 497, 509, 521, 526, 528, 529, 530, 531, - 532, 534, 535, 536, 537, 538, 539, 540, 541, 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, 569, 572, 581, 586, 587 + 115, 123, 125, 125, 126, 128, 128, 130, 202, 202, + 203, 203, 204, 205, 205, 207, 236, 236, 237, 238, + 238, 239, 239, 241, 241, 245, 245, 247, 247, 248, + 248, 249, 249, 249, 253, 260, 261, 261, 262, 263, + 265, 266, 288, 289, 289, 293, 297, 299, 300, 301, + 318, 323, 325, 327, 328, 330, 336, 344, 350, 352, + 353, 355, 361, 362, 362, 366, 372, 375, 378, 391, + 393, 393, 394, 396, 397, 399, 400, 401, 402, 404, + 406, 408, 410, 412, 414, 418, 422, 426, 428, 429, + 431, 440, 440, 442, 442, 443, 444, 452, 457, 459, + 461, 462, 463, 465, 469, 478, 484, 489, 489, 490, + 495, 497, 499, 511, 523, 528, 530, 531, 532, 533, + 534, 536, 537, 538, 539, 540, 541, 542, 543, 545, + 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, + 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, + 566, 567, 568, 569, 570, 571, 574, 583, 588, 589 }; #endif @@ -1030,59 +1032,59 @@ yyreduce: switch (yyn) { case 1: -#line 114 "compile.y" +#line 116 "compile.y" { - MethodPtr method(new Method(main_method_name, Method::CT_ANY, + Method& method=*new Method(/*main_method_name, */Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ - ArrayStringPtr(0)/*param_names*/, ArrayStringPtr(0)/*local_names*/, - yyvsp[0]/*parser_code*/, 0/*native_code*/)); + 0/*param_names*/, 0/*local_names*/, + yyvsp[0]/*parser_code*/, 0/*native_code*/); PC.cclass->add_method(main_method_name, method); ; break;} case 8: -#line 129 "compile.y" +#line 131 "compile.y" { - StringPtr command=LA2S(*yyvsp[-2]); + const String& command=*LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; 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->count()==1*2) { // new class' name - StringPtr name=LA2S(*strings_code); + const String& name=*LA2S(*strings_code); // creating the class - VStateless_classPtr cclass(new VClass); - PC.cclass=cclass.get(); + VStateless_class* cclass=new VClass; + PC.cclass=cclass; PC.cclass->set_name(name); // append to request's classes - PC.request->classes().put(name, cclass); + PC.request.classes().put(name, cclass); } else { strcpy(PC.error, "@"CLASS_NAME" must contain sole name"); YYERROR; } - } else if(*command==USE_CONTROL_METHOD_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) { + 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->count()==1*2) { - StringPtr base_name=LA2S(*strings_code); - if(ValuePtr base_class_value=PC.request->classes().get(base_name)) { + const String& base_name=*LA2S(*strings_code); + if(Value* base_class_value=PC.request.classes().get(base_name)) { // @CLASS == @BASE sanity check if(VStateless_class *base_class=base_class_value->get_class()) { if(PC.cclass==base_class) { @@ -1091,12 +1093,12 @@ case 8: } PC.cclass->get_class()->set_base(base_class); } else { // they asked to derive from a class without methods ['env' & co] - strcpy(PC.error, base_name->cstr()); + strcpy(PC.error, base_name.cstr()); strcat(PC.error, ": you can not derive from this class in @"BASE_NAME); YYERROR; } } else { - strcpy(PC.error, base_name->cstr()); + strcpy(PC.error, base_name.cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } @@ -1106,7 +1108,7 @@ case 8: } } 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; @@ -1114,53 +1116,53 @@ case 8: ; break;} case 12: -#line 201 "compile.y" +#line 203 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 16: -#line 206 "compile.y" +#line 208 "compile.y" { - StringPtr name=LA2S(*yyvsp[-5]); + const String& name=*LA2S(*yyvsp[-5]); YYSTYPE params_names_code=yyvsp[-4]; - ArrayStringPtr params_names; + ArrayString* params_names=0; if(int size=params_names_code->count()) { - params_names=ArrayStringPtr(new ArrayString); + params_names=new ArrayString; for(int i=0; icount()) { - locals_names=ArrayStringPtr(new ArrayString); + locals_names=new ArrayString; for(int i=0; iadd_method(name, method); ; break;} case 19: -#line 235 "compile.y" +#line 237 "compile.y" {yyval=yyvsp[-1]; break;} case 23: -#line 237 "compile.y" +#line 239 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 29: -#line 245 "compile.y" +#line 247 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 35: -#line 251 "compile.y" +#line 253 "compile.y" { yyval=yyvsp[0]; /* stack: resulting value */ changetail_or_append(*yyval, @@ -1170,19 +1172,19 @@ case 35: ; break;} case 36: -#line 258 "compile.y" +#line 260 "compile.y" { yyval=yyvsp[0] ; break;} case 39: -#line 260 "compile.y" +#line 262 "compile.y" { yyval=yyvsp[-1] ; break;} case 42: -#line 264 "compile.y" +#line 266 "compile.y" { yyval=N(); - ArrayOperationPtr diving_code=yyvsp[0]; - StringPtr first_name=LA2S(*diving_code); + ArrayOperation* diving_code=yyvsp[0]; + const String* 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) { @@ -1203,26 +1205,26 @@ case 42: ; break;} case 43: -#line 286 "compile.y" +#line 288 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 45: -#line 287 "compile.y" +#line 289 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 46: -#line 291 "compile.y" +#line 293 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} case 50: -#line 299 "compile.y" +#line 301 "compile.y" { yyval=N(); - ArrayOperationPtr diving_code=yyvsp[0]; - StringPtr first_name=LA2S(*diving_code); + ArrayOperation* diving_code=yyvsp[0]; + const String* 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) { @@ -1238,7 +1240,7 @@ case 50: ; break;} case 51: -#line 316 "compile.y" +#line 318 "compile.y" { yyval=N(); O(*yyval, OP_WITH_WRITE); /* stack: starting context */ @@ -1246,11 +1248,11 @@ case 51: ; break;} case 52: -#line 321 "compile.y" +#line 323 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 56: -#line 328 "compile.y" +#line 330 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value @@ -1258,7 +1260,7 @@ case 56: ; break;} case 57: -#line 334 "compile.y" +#line 336 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1268,7 +1270,7 @@ case 57: ; break;} case 58: -#line 342 "compile.y" +#line 344 "compile.y" { // stack: context, name yyval=N(); @@ -1276,7 +1278,7 @@ case 58: ; break;} case 62: -#line 353 "compile.y" +#line 355 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1285,11 +1287,11 @@ case 62: ; break;} case 65: -#line 360 "compile.y" +#line 362 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 66: -#line 364 "compile.y" +#line 366 "compile.y" { yyval=yyvsp[0]; /* stack: value */ changetail_or_append(*yyval, @@ -1298,83 +1300,83 @@ case 66: ; break;} case 67: -#line 370 "compile.y" +#line 372 "compile.y" { PC.in_call_value=true; ; break;} case 68: -#line 373 "compile.y" +#line 375 "compile.y" { PC.in_call_value=false; ; break;} case 69: -#line 376 "compile.y" +#line 378 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ YYSTYPE params_code=yyvsp[-1]; 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* value=LA2V(*params_code)) // it is OP_VALUE + value? if(!value->is_defined()) // value is VVoid? - params_code=YYSTYPE(0); // ^zzz[] case. don't append lone empty param. + params_code=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 ; break;} case 72: -#line 391 "compile.y" +#line 393 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 76: -#line 397 "compile.y" +#line 399 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 398 "compile.y" +#line 400 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 399 "compile.y" +#line 401 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 402 "compile.y" +#line 404 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 82: -#line 406 "compile.y" +#line 408 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 84: -#line 410 "compile.y" +#line 412 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 85: -#line 412 "compile.y" +#line 414 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_STORE_PARAM); ; break;} case 86: -#line 416 "compile.y" +#line 418 "compile.y" { yyval=N(); OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 87: -#line 420 "compile.y" +#line 422 "compile.y" { yyval=N(); OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 91: -#line 429 "compile.y" +#line 431 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1383,15 +1385,15 @@ case 91: ; break;} case 93: -#line 438 "compile.y" +#line 440 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 95: -#line 440 "compile.y" +#line 442 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 97: -#line 442 "compile.y" +#line 444 "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 @@ -1402,7 +1404,7 @@ case 97: ; break;} case 98: -#line 450 "compile.y" +#line 452 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ @@ -1410,16 +1412,16 @@ case 98: ; break;} case 104: -#line 463 "compile.y" +#line 465 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT); ; break;} case 105: -#line 467 "compile.y" +#line 469 "compile.y" { - ArrayOperationPtr code; + ArrayOperation* code; { change_string_literal_to_write_string_literal(*(code=yyvsp[-1])); P(*code, *yyvsp[0]); @@ -1429,7 +1431,7 @@ case 105: ; break;} case 106: -#line 476 "compile.y" +#line 478 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ @@ -1438,7 +1440,7 @@ case 106: ; break;} case 107: -#line 482 "compile.y" +#line 484 "compile.y" { yyval=N(); O(*yyval, OP_WITH_READ); @@ -1446,18 +1448,18 @@ case 107: ; break;} case 109: -#line 487 "compile.y" +#line 489 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 110: -#line 488 "compile.y" +#line 490 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} case 113: -#line 497 "compile.y" +#line 499 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseude BASE class @@ -1472,7 +1474,7 @@ case 113: ; break;} case 114: -#line 509 "compile.y" +#line 511 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -1483,7 +1485,7 @@ case 114: ; break;} case 115: -#line 521 "compile.y" +#line 523 "compile.y" { // see OP_PREPARE_TO_EXPRESSION!! if((yyval=yyvsp[0])->count()==2) // only one string literal in there? @@ -1491,159 +1493,159 @@ case 115: ; break;} case 119: -#line 530 "compile.y" +#line 532 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 531 "compile.y" +#line 533 "compile.y" { yyval = yyvsp[-1]; ; break;} case 121: -#line 532 "compile.y" +#line 534 "compile.y" { yyval = yyvsp[-1]; ; break;} case 122: -#line 534 "compile.y" +#line 536 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} case 123: -#line 535 "compile.y" +#line 537 "compile.y" { yyval=yyvsp[0] ; break;} case 124: -#line 536 "compile.y" +#line 538 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} case 125: -#line 537 "compile.y" +#line 539 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} case 126: -#line 538 "compile.y" +#line 540 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} case 127: -#line 539 "compile.y" +#line 541 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} case 128: -#line 540 "compile.y" +#line 542 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} case 129: -#line 541 "compile.y" +#line 543 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} case 130: -#line 543 "compile.y" +#line 545 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} case 131: -#line 544 "compile.y" +#line 546 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} case 132: -#line 545 "compile.y" +#line 547 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} case 133: -#line 546 "compile.y" +#line 548 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} case 134: -#line 547 "compile.y" +#line 549 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} case 135: -#line 548 "compile.y" +#line 550 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} case 136: -#line 549 "compile.y" +#line 551 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} case 137: -#line 550 "compile.y" +#line 552 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} case 138: -#line 551 "compile.y" +#line 553 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} case 139: -#line 552 "compile.y" +#line 554 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} case 140: -#line 553 "compile.y" +#line 555 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} case 141: -#line 554 "compile.y" +#line 556 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} case 142: -#line 555 "compile.y" +#line 557 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} case 143: -#line 556 "compile.y" +#line 558 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} case 144: -#line 557 "compile.y" +#line 559 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} case 145: -#line 558 "compile.y" +#line 560 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} case 146: -#line 559 "compile.y" +#line 561 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} case 147: -#line 560 "compile.y" +#line 562 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} case 148: -#line 561 "compile.y" +#line 563 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} case 149: -#line 562 "compile.y" +#line 564 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} case 150: -#line 563 "compile.y" +#line 565 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} case 151: -#line 564 "compile.y" +#line 566 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} case 152: -#line 565 "compile.y" +#line 567 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} case 153: -#line 566 "compile.y" +#line 568 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} case 154: -#line 567 "compile.y" +#line 569 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} case 155: -#line 568 "compile.y" +#line 570 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} case 156: -#line 569 "compile.y" +#line 571 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} case 157: -#line 572 "compile.y" +#line 574 "compile.y" { yyval=N(); OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1652,18 +1654,18 @@ case 157: ; break;} case 158: -#line 581 "compile.y" +#line 583 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) ; break;} case 159: -#line 586 "compile.y" -{ yyval=VL(ValuePtr(new VVoid())) ; +#line 588 "compile.y" +{ yyval=VL(new VVoid()) ; break;} case 160: -#line 587 "compile.y" +#line 589 "compile.y" { yyval=N() ; break;} } @@ -1888,7 +1890,7 @@ yyerrhandle: } return 1; } -#line 589 "compile.y" +#line 591 "compile.y" #endif @@ -1977,7 +1979,7 @@ default: case '"': case ':': if(end!=begin) { // append piece till ^ - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append(begin, end-begin); } // reset piece 'begin' position & line begin=PC.source; // ->punctuation @@ -1991,20 +1993,19 @@ default: case '#': if(end!=begin) { // append piece till ^ - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append(begin, end-begin); } // #HH ? if(PC.source[0]=='#' && PC.source[1] && PC.source[2]) { - char *hex=(char *)POOL.malloc(1); - hex[0]= + char c= hex_value[(unsigned char)PC.source[1]]*0x10+ hex_value[(unsigned char)PC.source[2]]; - if(hex[0]==0) { + if(c==0) { result=BAD_HEX_LITERAL; goto break2; // wrong hex value[no ^#00 chars allowed]: bail out } // append char(hex(HH)) - PC.string->APPEND_CLEAN(hex, 1, PC.file, begin_line); + PC.string.append(c); // skip over ^#HH PC.source+=3; PC.col+=3; @@ -2023,7 +2024,7 @@ default: if(c=='#' && PC.col==1) { if(end!=begin) { // append piece till # - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append(begin, end-begin); } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_USER_COMMENT); @@ -2166,7 +2167,7 @@ default: case '#': // comment start skipping if(end!=begin) { // append piece till # - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append(begin, end-begin); } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_EXPRESSION_COMMENT); @@ -2598,14 +2599,14 @@ break2: } if(end!=begin && PC.ls!=LS_USER_COMMENT) { // last piece still alive and not comment? // append it - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); + PC.string.append(begin, end-begin); } } - if(PC.string->size()) { // something accumulated? + if(PC.string!=CORD_EMPTY) { // something accumulated? // create STRING value: array of OP_VALUE+vstring - *lvalp=VL(ValuePtr(new VString(PC.string))); + *lvalp=VL(new VString(*new String(PC.string, String::L_CLEAN))); // new pieces storage - PC.string=StringPtr(new String); + PC.string.clear(); // make current result be pending for next call, return STRING for now PC.pending_state=result; result=STRING; } @@ -2622,5 +2623,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().get()); + fprintf(file, " \"%s\"", LA2S(*value)->cstr()); }