--- parser3/src/main/compile.tab.C 2009/06/02 10:24:34 1.137 +++ parser3/src/main/compile.tab.C 2009/06/04 09:42:23 1.138 @@ -132,7 +132,7 @@ Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.137 2009/06/02 10:24:34 misha Exp $ + $Id: compile.tab.C,v 1.138 2009/06/04 09:42:23 misha Exp $ */ /** @@ -459,21 +459,21 @@ static const unsigned short int yyrline[ 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 + 313, 313, 314, 314, 315, 315, 315, 319, 353, 354, + 354, 355, 357, 358, 359, 417, 418, 418, 422, 435, + 436, 437, 438, 455, 460, 463, 464, 465, 467, 470, + 467, 478, 486, 493, 494, 495, 497, 503, 504, 504, + 508, 519, 522, 519, 550, 552, 552, 554, 555, 556, + 558, 561, 558, 564, 565, 567, 568, 571, 572, 575, + 576, 578, 581, 595, 600, 601, 602, 607, 607, 609, + 609, 610, 611, 619, 624, 627, 628, 629, 630, 632, + 636, 645, 648, 645, 656, 661, 661, 662, 668, 669, + 671, 688, 700, 702, 703, 704, 705, 706, 707, 708, + 709, 711, 712, 713, 714, 715, 716, 717, 718, 720, + 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, + 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, + 741, 742, 743, 744, 745, 746, 749, 754, 775, 780, + 781, 782, 784 }; #endif @@ -1625,10 +1625,15 @@ yyreduce: { 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_SELF_ELEMENT + if(!maybe_change_first_opcode(*code, OP::OP_WITH_SELF__VALUE__GET_ELEMENT, /*=>*/OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE)) +#endif + #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT if( code->count()!=5 @@ -1654,17 +1659,17 @@ yyreduce: break; case 38: -#line 348 "compile.y" +#line 353 "compile.y" { yyval=yyvsp[0] ;} break; case 41: -#line 350 "compile.y" +#line 355 "compile.y" { yyval=yyvsp[-1] ;} break; case 44: -#line 354 "compile.y" +#line 359 "compile.y" { yyval=N(); YYSTYPE diving_code=yyvsp[0]; @@ -1673,21 +1678,28 @@ yyreduce: // 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... */ - count>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/); +#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT + if(maybe_make_with_self_get_element(*yyval, *diving_code, count)){ + // optimization for $self.field and ^self.method + } else +#endif + { + O(*yyval, OP::OP_WITH_SELF); /* stack: starting context */ + P(*yyval, *diving_code, + /* skip over... */ + 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[ + // optimization 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 + // optimization for $object.$var } #endif @@ -1719,17 +1731,17 @@ yyreduce: break; case 45: -#line 405 "compile.y" +#line 417 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 47: -#line 406 "compile.y" +#line 418 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 48: -#line 410 "compile.y" +#line 422 "compile.y" { yyval=N(); #ifdef OPTIMIZE_BYTECODE_CONSTRUCT @@ -1745,7 +1757,7 @@ yyreduce: break; case 52: -#line 426 "compile.y" +#line 438 "compile.y" { yyval=N(); YYSTYPE diving_code=yyvsp[0]; @@ -1766,7 +1778,7 @@ yyreduce: break; case 53: -#line 443 "compile.y" +#line 455 "compile.y" { yyval=N(); O(*yyval, OP::OP_WITH_WRITE); /* stack: starting context */ @@ -1775,12 +1787,12 @@ yyreduce: break; case 54: -#line 448 "compile.y" +#line 460 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 58: -#line 455 "compile.y" +#line 467 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1788,14 +1800,14 @@ yyreduce: break; case 59: -#line 458 "compile.y" +#line 470 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 60: -#line 460 "compile.y" +#line 472 "compile.y" { // stack: context, name yyval=yyvsp[-2]; // stack: context, name, value @@ -1804,7 +1816,7 @@ yyreduce: break; case 61: -#line 466 "compile.y" +#line 478 "compile.y" { yyval=N(); O(*yyval, OP::OP_PREPARE_TO_EXPRESSION); @@ -1815,7 +1827,7 @@ yyreduce: break; case 62: -#line 474 "compile.y" +#line 486 "compile.y" { // stack: context, name yyval=N(); @@ -1824,7 +1836,7 @@ yyreduce: break; case 66: -#line 485 "compile.y" +#line 497 "compile.y" { yyval=N(); OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1834,12 +1846,12 @@ yyreduce: break; case 69: -#line 492 "compile.y" +#line 504 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 70: -#line 496 "compile.y" +#line 508 "compile.y" { #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR if((*yyvsp[0]).count()) @@ -1854,21 +1866,21 @@ yyreduce: break; case 71: -#line 507 "compile.y" +#line 519 "compile.y" { PC.in_call_value=true; ;} break; case 72: -#line 510 "compile.y" +#line 522 "compile.y" { PC.in_call_value=false; ;} break; case 73: -#line 513 "compile.y" +#line 525 "compile.y" { /* ^field.$method{vasya} */ #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -1896,12 +1908,12 @@ yyreduce: break; case 76: -#line 540 "compile.y" +#line 552 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 80: -#line 546 "compile.y" +#line 558 "compile.y" { // allow ^call[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1909,51 +1921,51 @@ yyreduce: break; case 81: -#line 549 "compile.y" +#line 561 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 82: -#line 551 "compile.y" +#line 563 "compile.y" {yyval=yyvsp[-2];} break; case 83: -#line 552 "compile.y" +#line 564 "compile.y" {yyval=yyvsp[-1];} break; case 84: -#line 553 "compile.y" +#line 565 "compile.y" {yyval=yyvsp[-1];} break; case 86: -#line 556 "compile.y" +#line 568 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 88: -#line 560 "compile.y" +#line 572 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 90: -#line 564 "compile.y" +#line 576 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 91: -#line 566 "compile.y" +#line 578 "compile.y" { yyval=yyvsp[0]; ;} break; case 92: -#line 569 "compile.y" +#line 581 "compile.y" { YYSTYPE expr_code=yyvsp[0]; if(expr_code->count()==3 @@ -1971,7 +1983,7 @@ yyreduce: break; case 93: -#line 583 "compile.y" +#line 595 "compile.y" { yyval=N(); OA(*yyval, OP::OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); @@ -1979,17 +1991,17 @@ yyreduce: break; case 98: -#line 595 "compile.y" +#line 607 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 100: -#line 597 "compile.y" +#line 609 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 102: -#line 599 "compile.y" +#line 611 "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 @@ -2001,7 +2013,7 @@ yyreduce: break; case 103: -#line 607 "compile.y" +#line 619 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ @@ -2010,7 +2022,7 @@ yyreduce: break; case 109: -#line 620 "compile.y" +#line 632 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT); @@ -2018,7 +2030,7 @@ yyreduce: break; case 110: -#line 624 "compile.y" +#line 636 "compile.y" { YYSTYPE code; { @@ -2031,7 +2043,7 @@ yyreduce: break; case 111: -#line 633 "compile.y" +#line 645 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -2039,14 +2051,14 @@ yyreduce: break; case 112: -#line 636 "compile.y" +#line 648 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 113: -#line 638 "compile.y" +#line 650 "compile.y" { yyval=N(); OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ @@ -2056,7 +2068,7 @@ yyreduce: break; case 114: -#line 644 "compile.y" +#line 656 "compile.y" { yyval=N(); O(*yyval, OP::OP_WITH_READ); @@ -2065,12 +2077,12 @@ yyreduce: break; case 116: -#line 649 "compile.y" +#line 661 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 117: -#line 650 "compile.y" +#line 662 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT__WRITE); @@ -2078,7 +2090,7 @@ yyreduce: break; case 120: -#line 659 "compile.y" +#line 671 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -2091,7 +2103,7 @@ yyreduce: } #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*/) + maybe_change_first_opcode(*yyval, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS) #else O(*yyval, OP::OP_GET_CLASS); #endif @@ -2099,7 +2111,7 @@ yyreduce: break; case 121: -#line 676 "compile.y" +#line 688 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -2111,197 +2123,197 @@ yyreduce: break; case 128: -#line 695 "compile.y" +#line 707 "compile.y" { yyval = yyvsp[-1] ;} break; case 129: -#line 696 "compile.y" +#line 708 "compile.y" { yyval = yyvsp[-1] ;} break; case 130: -#line 697 "compile.y" +#line 709 "compile.y" { yyval = yyvsp[-1]; ;} break; case 131: -#line 699 "compile.y" +#line 711 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_NEG) ;} break; case 132: -#line 700 "compile.y" +#line 712 "compile.y" { yyval=yyvsp[0] ;} break; case 133: -#line 701 "compile.y" +#line 713 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_INV) ;} break; case 134: -#line 702 "compile.y" +#line 714 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_NOT) ;} break; case 135: -#line 703 "compile.y" +#line 715 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_DEF) ;} break; case 136: -#line 704 "compile.y" +#line 716 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_IN) ;} break; case 137: -#line 705 "compile.y" +#line 717 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_FEXISTS) ;} break; case 138: -#line 706 "compile.y" +#line 718 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_DEXISTS) ;} break; case 139: -#line 708 "compile.y" +#line 720 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_SUB) ;} break; case 140: -#line 709 "compile.y" +#line 721 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_ADD) ;} break; case 141: -#line 710 "compile.y" +#line 722 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MUL) ;} break; case 142: -#line 711 "compile.y" +#line 723 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_DIV) ;} break; case 143: -#line 712 "compile.y" +#line 724 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MOD) ;} break; case 144: -#line 713 "compile.y" +#line 725 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_INTDIV) ;} break; case 145: -#line 714 "compile.y" +#line 726 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SL) ;} break; case 146: -#line 715 "compile.y" +#line 727 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SR) ;} break; case 147: -#line 716 "compile.y" +#line 728 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_AND) ;} break; case 148: -#line 717 "compile.y" +#line 729 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_OR) ;} break; case 149: -#line 718 "compile.y" +#line 730 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_XOR) ;} break; case 150: -#line 719 "compile.y" +#line 731 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_AND) ;} break; case 151: -#line 720 "compile.y" +#line 732 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_OR) ;} break; case 152: -#line 721 "compile.y" +#line 733 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_LOG_XOR) ;} break; case 153: -#line 722 "compile.y" +#line 734 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LT) ;} break; case 154: -#line 723 "compile.y" +#line 735 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GT) ;} break; case 155: -#line 724 "compile.y" +#line 736 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LE) ;} break; case 156: -#line 725 "compile.y" +#line 737 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GE) ;} break; case 157: -#line 726 "compile.y" +#line 738 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_EQ) ;} break; case 158: -#line 727 "compile.y" +#line 739 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_NE) ;} break; case 159: -#line 728 "compile.y" +#line 740 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LT) ;} break; case 160: -#line 729 "compile.y" +#line 741 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GT) ;} break; case 161: -#line 730 "compile.y" +#line 742 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LE) ;} break; case 162: -#line 731 "compile.y" +#line 743 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GE) ;} break; case 163: -#line 732 "compile.y" +#line 744 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_EQ) ;} break; case 164: -#line 733 "compile.y" +#line 745 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_NE) ;} break; case 165: -#line 734 "compile.y" +#line 746 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_IS) ;} break; case 166: -#line 737 "compile.y" +#line 749 "compile.y" { // optimized OP_STRING => OP_VALUE for doubles maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0])); @@ -2309,7 +2321,7 @@ yyreduce: break; case 167: -#line 742 "compile.y" +#line 754 "compile.y" { #ifdef OPTIMIZE_BYTECODE_STRING_POOL // it brakes ^if(" 09 "){...} @@ -2331,7 +2343,7 @@ yyreduce: break; case 168: -#line 763 "compile.y" +#line 775 "compile.y" { // optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) @@ -2339,22 +2351,22 @@ yyreduce: break; case 169: -#line 768 "compile.y" +#line 780 "compile.y" { yyval=VL(/*we know that we will not change it*/const_cast(&vvoid), 0, 0, 0) ;} break; case 170: -#line 769 "compile.y" +#line 781 "compile.y" { yyval = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0) ;} break; case 171: -#line 770 "compile.y" +#line 782 "compile.y" { yyval = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0) ;} break; case 172: -#line 772 "compile.y" +#line 784 "compile.y" { yyval=N() ;} break; @@ -2362,7 +2374,7 @@ yyreduce: } /* Line 1010 of yacc.c. */ -#line 2366 "compile.tab.C" +#line 2378 "compile.tab.C" yyvsp -= yylen; yyssp -= yylen; @@ -2587,7 +2599,7 @@ yyreturn: } -#line 774 "compile.y" +#line 786 "compile.y" #endif