--- parser3/src/main/compile.tab.C 2009/04/17 12:19:34 1.125 +++ parser3/src/main/compile.tab.C 2009/06/02 10:24:34 1.137 @@ -129,10 +129,10 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.125 2009/04/17 12:19:34 misha Exp $ + $Id: compile.tab.C,v 1.137 2009/06/02 10:24:34 misha Exp $ */ /** @@ -171,6 +171,7 @@ #define OPTIONS_CONTROL_METHOD_NAME "OPTIONS" #define OPTION_ALL_VARS_LOCAL_NAME "locals" #define OPTION_PARTIAL_CLASS "partial" +#define REM_OPERATOR_NAME "rem" // forwards @@ -216,7 +217,7 @@ typedef int YYSTYPE; /* Line 214 of yacc.c. */ -#line 220 "compile.tab.C" +#line 221 "compile.tab.C" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -455,24 +456,24 @@ static const short int yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 131, 131, 138, 140, 140, 141, 143, 143, 145, - 246, 246, 247, 247, 248, 249, 249, 251, 251, 301, - 301, 302, 303, 303, 304, 304, 306, 306, 310, 310, - 312, 312, 313, 313, 314, 314, 314, 318, 325, 326, - 326, 327, 329, 330, 331, 353, 354, 354, 358, 363, - 364, 365, 366, 383, 388, 391, 392, 393, 395, 398, - 395, 406, 414, 421, 422, 423, 425, 431, 432, 432, - 436, 442, 445, 442, 461, 463, 463, 465, 466, 467, - 469, 472, 469, 475, 476, 478, 479, 482, 483, 486, - 487, 489, 493, 508, 513, 514, 515, 520, 520, 522, - 522, 523, 524, 532, 537, 540, 541, 542, 543, 545, - 549, 558, 561, 558, 569, 574, 574, 575, 581, 582, - 584, 596, 608, 610, 611, 612, 613, 614, 615, 616, - 617, 619, 620, 621, 622, 623, 624, 625, 626, 628, - 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, - 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, - 649, 650, 651, 652, 653, 654, 657, 662, 671, 676, - 677, 678, 680 + 0, 132, 132, 139, 141, 141, 142, 144, 144, 146, + 247, 247, 248, 248, 249, 250, 250, 252, 252, 302, + 302, 303, 304, 304, 305, 305, 307, 307, 311, 311, + 313, 313, 314, 314, 315, 315, 315, 319, 348, 349, + 349, 350, 352, 353, 354, 405, 406, 406, 410, 423, + 424, 425, 426, 443, 448, 451, 452, 453, 455, 458, + 455, 466, 474, 481, 482, 483, 485, 491, 492, 492, + 496, 507, 510, 507, 538, 540, 540, 542, 543, 544, + 546, 549, 546, 552, 553, 555, 556, 559, 560, 563, + 564, 566, 569, 583, 588, 589, 590, 595, 595, 597, + 597, 598, 599, 607, 612, 615, 616, 617, 618, 620, + 624, 633, 636, 633, 644, 649, 649, 650, 656, 657, + 659, 676, 688, 690, 691, 692, 693, 694, 695, 696, + 697, 699, 700, 701, 702, 703, 704, 705, 706, 708, + 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, + 719, 720, 721, 722, 723, 724, 725, 726, 727, 728, + 729, 730, 731, 732, 733, 734, 737, 742, 763, 768, + 769, 770, 772 }; #endif @@ -1427,7 +1428,7 @@ yyreduce: switch (yyn) { case 2: -#line 131 "compile.y" +#line 132 "compile.y" { Method& method=*new Method(Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ @@ -1438,7 +1439,7 @@ yyreduce: break; case 9: -#line 146 "compile.y" +#line 147 "compile.y" { const String& command=*LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; @@ -1542,12 +1543,12 @@ yyreduce: break; case 13: -#line 247 "compile.y" +#line 248 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 17: -#line 251 "compile.y" +#line 252 "compile.y" { PC.class_add(); PC.explicit_result=false; @@ -1592,7 +1593,7 @@ yyreduce: break; case 18: -#line 291 "compile.y" +#line 292 "compile.y" { Method& method=*reinterpret_cast(yyvsp[-1]); // fill in the code @@ -1605,93 +1606,152 @@ yyreduce: break; case 21: -#line 302 "compile.y" +#line 303 "compile.y" {yyval=yyvsp[-1];} break; case 25: -#line 304 "compile.y" +#line 305 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 31: -#line 312 "compile.y" +#line 313 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 37: -#line 318 "compile.y" +#line 319 "compile.y" { - yyval=yyvsp[0]; /* stack: resulting value */ - changetail_or_append(*yyval, - OP::OP_GET_ELEMENT, false, /*->*/OP::OP_GET_ELEMENT__WRITE, - /*or */OP::OP_WRITE_VALUE - ); /* value=pop; wcontext.write(value) */ + yyval=N(); + YYSTYPE code=yyvsp[0]; +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + if(!maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE)) +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + if( + code->count()!=5 + || !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE) + ) +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + if( + code->count()!=5 + || !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE) + ) +#endif + { + changetail_or_append(*code, + OP::OP_GET_ELEMENT, false, /*=>*/OP::OP_GET_ELEMENT__WRITE, + /*or */OP::OP_WRITE_VALUE + ); /* value=pop; wcontext.write(value) */ + } + + P(*yyval, *code); ;} break; case 38: -#line 325 "compile.y" +#line 348 "compile.y" { yyval=yyvsp[0] ;} break; case 41: -#line 327 "compile.y" +#line 350 "compile.y" { yyval=yyvsp[-1] ;} break; case 44: -#line 331 "compile.y" +#line 354 "compile.y" { yyval=N(); - ArrayOperation* diving_code=yyvsp[0]; + YYSTYPE diving_code=yyvsp[0]; const String* first_name=LA2S(*diving_code); - // self.xxx... -> xxx... + size_t count=diving_code->count(); + // self.xxx... => xxx... // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { O(*yyval, OP::OP_WITH_SELF); /* stack: starting context */ P(*yyval, *diving_code, /* skip over... */ - diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/); + count>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/); + } + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + else if(maybe_make_get_object_element(*yyval, *diving_code, count)){ + // optimisation for $object.field + ^object.method[ + } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + else if(maybe_make_get_object_var_element(*yyval, *diving_code, count)){ + // optimisation for $object.$var + } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + else if(count==4){ // optimization + O(*yyval, + (PC.in_call_value) + ? OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR // ^object[ : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT_OR_OPERATOR+origin+string + : OP::OP_VALUE__GET_ELEMENT // $object : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT+origin+string + ); + P(*yyval, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value } else { O(*yyval, OP::OP_WITH_READ); /* stack: starting context */ + P(*yyval, *diving_code); + } +#else + else { + O(*yyval, OP::OP_WITH_READ); /* stack: starting context */ - // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR - // OP_VALUE+origin+string+OP_GET_ELEMENT. -> OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR. - if(PC.in_call_value && diving_code->count()==4) - diving_code->put(4-1, OP::OP_GET_ELEMENT_OR_OPERATOR); + // ^if OP_ELEMENT => ^if OP_ELEMENT_OR_OPERATOR + // optimized OP_VALUE+origin+string+OP_GET_ELEMENT. => OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR. + if(PC.in_call_value && count==4) + diving_code->put(count-1, OP::OP_GET_ELEMENT_OR_OPERATOR); P(*yyval, *diving_code); } +#endif /* diving code; stack: current context */ ;} break; case 45: -#line 353 "compile.y" +#line 405 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 47: -#line 354 "compile.y" +#line 406 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 48: -#line 358 "compile.y" +#line 410 "compile.y" { - yyval=yyvsp[-1]; /* stack: context,name */ - P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ + yyval=N(); +#ifdef OPTIMIZE_BYTECODE_CONSTRUCT + if(maybe_optimize_construct(*yyval, *yyvsp[-1], *yyvsp[0])){ + // $a(expr), $.a(expr), $a[value], $.a[value] + } else +#endif + { + P(*yyval, *yyvsp[-1]); /* stack: context,name */ + P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ + } ;} break; case 52: -#line 366 "compile.y" +#line 426 "compile.y" { yyval=N(); - ArrayOperation* diving_code=yyvsp[0]; + YYSTYPE diving_code=yyvsp[0]; const String* first_name=LA2S(*diving_code); - // $self.xxx... -> $xxx... - // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... + // $self.xxx... => $xxx... + // OP_VALUE+origin+string+OP_GET_ELEMENT+... => OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { O(*yyval, OP::OP_WITH_SELF); /* stack: starting context */ P(*yyval, *diving_code, @@ -1706,7 +1766,7 @@ yyreduce: break; case 53: -#line 383 "compile.y" +#line 443 "compile.y" { yyval=N(); O(*yyval, OP::OP_WITH_WRITE); /* stack: starting context */ @@ -1715,12 +1775,12 @@ yyreduce: break; case 54: -#line 388 "compile.y" +#line 448 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 58: -#line 395 "compile.y" +#line 455 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1728,14 +1788,14 @@ yyreduce: break; case 59: -#line 398 "compile.y" +#line 458 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 60: -#line 400 "compile.y" +#line 460 "compile.y" { // stack: context, name yyval=yyvsp[-2]; // stack: context, name, value @@ -1744,7 +1804,7 @@ yyreduce: break; case 61: -#line 406 "compile.y" +#line 466 "compile.y" { yyval=N(); O(*yyval, OP::OP_PREPARE_TO_EXPRESSION); @@ -1755,7 +1815,7 @@ yyreduce: break; case 62: -#line 414 "compile.y" +#line 474 "compile.y" { // stack: context, name yyval=N(); @@ -1764,7 +1824,7 @@ yyreduce: break; case 66: -#line 425 "compile.y" +#line 485 "compile.y" { yyval=N(); OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1774,57 +1834,74 @@ yyreduce: break; case 69: -#line 432 "compile.y" +#line 492 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 70: -#line 436 "compile.y" +#line 496 "compile.y" { - yyval=yyvsp[0]; /* stack: value */ - changetail_or_append(*yyval, - OP::OP_CALL, true, /*->*/ OP::OP_CALL__WRITE, - /*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ +#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR + if((*yyvsp[0]).count()) +#endif + { + yyval=yyvsp[0]; /* stack: value */ + changetail_or_append(*yyval, + OP::OP_CALL, true, /*=>*/ OP::OP_CALL__WRITE, + /*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ + } ;} break; case 71: -#line 442 "compile.y" +#line 507 "compile.y" { PC.in_call_value=true; ;} break; case 72: -#line 445 "compile.y" +#line 510 "compile.y" { PC.in_call_value=false; ;} break; case 73: -#line 448 "compile.y" +#line 513 "compile.y" { /* ^field.$method{vasya} */ - yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ +#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + const String* operator_name=LA2S(*yyvsp[-3], 0, OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR); +#else + const String* operator_name=LA2S(*yyvsp[-3], 1); +#endif + if(operator_name && *operator_name == REM_OPERATOR_NAME){ + yyval=N(); + } else +#endif + { + yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ - YYSTYPE params_code=yyvsp[-1]; - if(params_code->count()==4) { // probably [] case. [OP::OP_VALUE+origin+Void+STORE_PARAM] - if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value? - if(value->is_void()) // value is VVoid? - params_code=0; // ^zzz[] case. don't append lone empty param. - } - /* stack: context, method_junction */ - OA(*yyval, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + YYSTYPE params_code=yyvsp[-1]; + if(params_code->count()==3) { // probably [] case. [OP::OP_VALUE+origin+Void] + if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value? + if(value->is_void()) // value is VVoid? + params_code=0; // ^zzz[] case. don't append lone empty param. + } + /* stack: context, method_junction */ + OA(*yyval, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + } ;} break; case 76: -#line 463 "compile.y" +#line 540 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 80: -#line 469 "compile.y" +#line 546 "compile.y" { // allow ^call[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1832,60 +1909,58 @@ yyreduce: break; case 81: -#line 472 "compile.y" +#line 549 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 82: -#line 474 "compile.y" +#line 551 "compile.y" {yyval=yyvsp[-2];} break; case 83: -#line 475 "compile.y" +#line 552 "compile.y" {yyval=yyvsp[-1];} break; case 84: -#line 476 "compile.y" +#line 553 "compile.y" {yyval=yyvsp[-1];} break; case 86: -#line 479 "compile.y" +#line 556 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 88: -#line 483 "compile.y" +#line 560 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 90: -#line 487 "compile.y" +#line 564 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 91: -#line 489 "compile.y" +#line 566 "compile.y" { yyval=yyvsp[0]; - O(*yyval, OP::OP_STORE_PARAM); ;} break; case 92: -#line 493 "compile.y" +#line 569 "compile.y" { YYSTYPE expr_code=yyvsp[0]; if(expr_code->count()==3 - && (*expr_code)[0].code==OP::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double] + && (*expr_code)[0].code==OP::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double]. no evaluating yyval=expr_code; - O(*yyval, OP::OP_STORE_PARAM); // no evaluating } else { - ArrayOperation* code=N(); + YYSTYPE code=N(); O(*code, OP::OP_PREPARE_TO_EXPRESSION); P(*code, *expr_code); O(*code, OP::OP_WRITE_EXPR_RESULT); @@ -1896,7 +1971,7 @@ yyreduce: break; case 93: -#line 508 "compile.y" +#line 583 "compile.y" { yyval=N(); OA(*yyval, OP::OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); @@ -1904,17 +1979,17 @@ yyreduce: break; case 98: -#line 520 "compile.y" +#line 595 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 100: -#line 522 "compile.y" +#line 597 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 102: -#line 524 "compile.y" +#line 599 "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 @@ -1926,7 +2001,7 @@ yyreduce: break; case 103: -#line 532 "compile.y" +#line 607 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ @@ -1935,7 +2010,7 @@ yyreduce: break; case 109: -#line 545 "compile.y" +#line 620 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT); @@ -1943,9 +2018,9 @@ yyreduce: break; case 110: -#line 549 "compile.y" +#line 624 "compile.y" { - ArrayOperation* code; + YYSTYPE code; { change_string_literal_to_write_string_literal(*(code=yyvsp[-1])); P(*code, *yyvsp[0]); @@ -1956,7 +2031,7 @@ yyreduce: break; case 111: -#line 558 "compile.y" +#line 633 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1964,14 +2039,14 @@ yyreduce: break; case 112: -#line 561 "compile.y" +#line 636 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 113: -#line 563 "compile.y" +#line 638 "compile.y" { yyval=N(); OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ @@ -1981,7 +2056,7 @@ yyreduce: break; case 114: -#line 569 "compile.y" +#line 644 "compile.y" { yyval=N(); O(*yyval, OP::OP_WITH_READ); @@ -1990,12 +2065,12 @@ yyreduce: break; case 116: -#line 574 "compile.y" +#line 649 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 117: -#line 575 "compile.y" +#line 650 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT__WRITE); @@ -2003,7 +2078,7 @@ yyreduce: break; case 120: -#line 584 "compile.y" +#line 659 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -2014,12 +2089,17 @@ yyreduce: YYERROR; } } +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + // optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string + maybe_change_first_opcode(*yyval, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS, true/*assert if top opcode != OP_VALUE*/) +#else O(*yyval, OP::OP_GET_CLASS); +#endif ;} break; case 121: -#line 596 "compile.y" +#line 676 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -2031,238 +2111,250 @@ yyreduce: break; case 128: -#line 615 "compile.y" +#line 695 "compile.y" { yyval = yyvsp[-1] ;} break; case 129: -#line 616 "compile.y" +#line 696 "compile.y" { yyval = yyvsp[-1] ;} break; case 130: -#line 617 "compile.y" +#line 697 "compile.y" { yyval = yyvsp[-1]; ;} break; case 131: -#line 619 "compile.y" +#line 699 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_NEG) ;} break; case 132: -#line 620 "compile.y" +#line 700 "compile.y" { yyval=yyvsp[0] ;} break; case 133: -#line 621 "compile.y" +#line 701 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_INV) ;} break; case 134: -#line 622 "compile.y" +#line 702 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_NOT) ;} break; case 135: -#line 623 "compile.y" +#line 703 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_DEF) ;} break; case 136: -#line 624 "compile.y" +#line 704 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_IN) ;} break; case 137: -#line 625 "compile.y" +#line 705 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_FEXISTS) ;} break; case 138: -#line 626 "compile.y" +#line 706 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_DEXISTS) ;} break; case 139: -#line 628 "compile.y" +#line 708 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_SUB) ;} break; case 140: -#line 629 "compile.y" +#line 709 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_ADD) ;} break; case 141: -#line 630 "compile.y" +#line 710 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MUL) ;} break; case 142: -#line 631 "compile.y" +#line 711 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_DIV) ;} break; case 143: -#line 632 "compile.y" +#line 712 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MOD) ;} break; case 144: -#line 633 "compile.y" +#line 713 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_INTDIV) ;} break; case 145: -#line 634 "compile.y" +#line 714 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SL) ;} break; case 146: -#line 635 "compile.y" +#line 715 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SR) ;} break; case 147: -#line 636 "compile.y" +#line 716 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_AND) ;} break; case 148: -#line 637 "compile.y" +#line 717 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_OR) ;} break; case 149: -#line 638 "compile.y" +#line 718 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_XOR) ;} break; case 150: -#line 639 "compile.y" +#line 719 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_AND) ;} break; case 151: -#line 640 "compile.y" +#line 720 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_OR) ;} break; case 152: -#line 641 "compile.y" +#line 721 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_LOG_XOR) ;} break; case 153: -#line 642 "compile.y" +#line 722 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LT) ;} break; case 154: -#line 643 "compile.y" +#line 723 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GT) ;} break; case 155: -#line 644 "compile.y" +#line 724 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LE) ;} break; case 156: -#line 645 "compile.y" +#line 725 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GE) ;} break; case 157: -#line 646 "compile.y" +#line 726 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_EQ) ;} break; case 158: -#line 647 "compile.y" +#line 727 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_NE) ;} break; case 159: -#line 648 "compile.y" +#line 728 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LT) ;} break; case 160: -#line 649 "compile.y" +#line 729 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GT) ;} break; case 161: -#line 650 "compile.y" +#line 730 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LE) ;} break; case 162: -#line 651 "compile.y" +#line 731 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GE) ;} break; case 163: -#line 652 "compile.y" +#line 732 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_EQ) ;} break; case 164: -#line 653 "compile.y" +#line 733 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_NE) ;} break; case 165: -#line 654 "compile.y" +#line 734 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_IS) ;} break; case 166: -#line 657 "compile.y" +#line 737 "compile.y" { - // optimized from OP_STRING->OP_VALUE for doubles + // optimized OP_STRING => OP_VALUE for doubles maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0])); ;} break; case 167: -#line 662 "compile.y" +#line 742 "compile.y" { +#ifdef OPTIMIZE_BYTECODE_STRING_POOL + // it brakes ^if(" 09 "){...} + YYSTYPE code=yyvsp[0]; + yyval=N(); + if(code->count()==3 && maybe_change_first_opcode(*code, OP::OP_STRING__WRITE, OP::OP_VALUE)){ + // optimized OP_STRING__WRITE+origin+value => OP_VALUE+origin+value without starting OP_STRING_POOL + P(*yyval, *code); + } else { + OA(*yyval, OP::OP_STRING_POOL, code); /* stack: empty write context */ + } +#else yyval=N(); OA(*yyval, OP::OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ +#endif /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ ;} break; case 168: -#line 671 "compile.y" +#line 763 "compile.y" { - // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE + // optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) ;} break; case 169: -#line 676 "compile.y" +#line 768 "compile.y" { yyval=VL(/*we know that we will not change it*/const_cast(&vvoid), 0, 0, 0) ;} break; case 170: -#line 677 "compile.y" +#line 769 "compile.y" { yyval = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0) ;} break; case 171: -#line 678 "compile.y" +#line 770 "compile.y" { yyval = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0) ;} break; case 172: -#line 680 "compile.y" +#line 772 "compile.y" { yyval=N() ;} break; @@ -2270,7 +2362,7 @@ yyreduce: } /* Line 1010 of yacc.c. */ -#line 2274 "compile.tab.C" +#line 2366 "compile.tab.C" yyvsp -= yylen; yyssp -= yylen; @@ -2495,7 +2587,7 @@ yyreturn: } -#line 682 "compile.y" +#line 774 "compile.y" #endif