--- parser3/src/main/compile.tab.C 2009/04/17 09:25:41 1.124 +++ parser3/src/main/compile.tab.C 2009/04/28 11:58:06 1.126 @@ -132,7 +132,7 @@ Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.124 2009/04/17 09:25:41 misha Exp $ + $Id: compile.tab.C,v 1.126 2009/04/28 11:58:06 misha Exp $ */ /** @@ -456,23 +456,23 @@ static const short int yyrhs[] = 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, 305, - 305, 306, 307, 307, 308, 308, 310, 310, 314, 314, - 316, 316, 317, 317, 318, 318, 318, 322, 329, 330, - 330, 331, 333, 334, 335, 357, 358, 358, 362, 367, - 368, 369, 370, 389, 394, 397, 398, 399, 401, 404, - 401, 412, 420, 427, 428, 429, 431, 437, 438, 438, - 442, 448, 451, 448, 467, 469, 469, 471, 472, 473, - 475, 478, 475, 481, 482, 484, 485, 488, 489, 492, - 493, 495, 499, 514, 519, 520, 521, 526, 526, 528, - 528, 529, 530, 538, 543, 546, 547, 548, 549, 551, - 555, 564, 567, 564, 575, 580, 580, 581, 587, 588, - 590, 602, 614, 616, 617, 618, 619, 620, 621, 622, - 623, 625, 626, 627, 628, 629, 630, 631, 632, 634, - 635, 636, 637, 638, 639, 640, 641, 642, 643, 644, - 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, - 655, 656, 657, 658, 659, 660, 663, 668, 677, 682, - 683, 684, 686 + 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, 326, 327, + 327, 328, 330, 331, 332, 368, 369, 369, 373, 378, + 379, 380, 381, 398, 403, 406, 407, 408, 410, 413, + 410, 421, 429, 436, 437, 438, 440, 446, 447, 447, + 451, 457, 460, 457, 476, 478, 478, 480, 481, 482, + 484, 487, 484, 490, 491, 493, 494, 497, 498, 501, + 502, 504, 508, 523, 528, 529, 530, 535, 535, 537, + 537, 538, 539, 547, 552, 555, 556, 557, 558, 560, + 564, 573, 576, 573, 584, 589, 589, 590, 596, 597, + 599, 616, 628, 630, 631, 632, 633, 634, 635, 636, + 637, 639, 640, 641, 642, 643, 644, 645, 646, 648, + 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, + 659, 660, 661, 662, 663, 664, 665, 666, 667, 668, + 669, 670, 671, 672, 673, 674, 677, 682, 691, 696, + 697, 698, 700 }; #endif @@ -1551,7 +1551,6 @@ yyreduce: { PC.class_add(); PC.explicit_result=false; - PC.write_to_result=false; YYSTYPE params_names_code=yyvsp[-3]; ArrayString* params_names=0; @@ -1593,15 +1592,12 @@ yyreduce: break; case 18: -#line 292 "compile.y" +#line 291 "compile.y" { Method& method=*reinterpret_cast(yyvsp[-1]); // fill in the code method.parser_code=yyvsp[0]; - // write to $result was detected in method's code during compilation - method.write_to_result=PC.write_to_result; - // register in class const String& name=*LA2S(*yyvsp[-6]); PC.cclass->add_method(PC.alias_method(name), method); @@ -1609,43 +1605,44 @@ yyreduce: break; case 21: -#line 306 "compile.y" +#line 302 "compile.y" {yyval=yyvsp[-1];} break; case 25: -#line 308 "compile.y" +#line 304 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 31: -#line 316 "compile.y" +#line 312 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 37: -#line 322 "compile.y" +#line 318 "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) */ + if(!replace_top_opcode(*yyval, OP::OP_VALUE__GET_ELEMENT, OP::OP_VALUE__GET_ELEMENT__WRITE)) + changetail_or_append(*yyval, + OP::OP_GET_ELEMENT, false, /*->*/OP::OP_GET_ELEMENT__WRITE, + /*or */OP::OP_WRITE_VALUE + ); /* value=pop; wcontext.write(value) */ ;} break; case 38: -#line 329 "compile.y" +#line 326 "compile.y" { yyval=yyvsp[0] ;} break; case 41: -#line 331 "compile.y" +#line 328 "compile.y" { yyval=yyvsp[-1] ;} break; case 44: -#line 335 "compile.y" +#line 332 "compile.y" { yyval=N(); ArrayOperation* diving_code=yyvsp[0]; @@ -1658,6 +1655,19 @@ yyreduce: /* skip over... */ diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/); } else { +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + if(diving_code->count()==4){ // optimisations for simple (but very popular) cases + O(*yyval, + (PC.in_call_value) // ^call + ? OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR // OP_VALUE+origin+string+OP_GET_ELEMENT -> OP_VALUE__GET_ELEMENT_OR_OPERATOR+origin+string + : OP::OP_VALUE__GET_ELEMENT // OP_VALUE+origin+string+OP_GET_ELEMENT -> OP_VALUE__GET_ELEMENT+origin+string + ); + P(*yyval, *diving_code, 1/*offset==1: skip leading OP_VALUE*/, 2/*limit==2: skip trailing OP_GET_ELEMENT*/); + } else { + O(*yyval, OP::OP_WITH_READ); /* stack: starting context */ + P(*yyval, *diving_code); + } +#else O(*yyval, OP::OP_WITH_READ); /* stack: starting context */ // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR @@ -1665,23 +1675,24 @@ yyreduce: if(PC.in_call_value && diving_code->count()==4) diving_code->put(4-1, OP::OP_GET_ELEMENT_OR_OPERATOR); P(*yyval, *diving_code); +#endif } /* diving code; stack: current context */ ;} break; case 45: -#line 357 "compile.y" +#line 368 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 47: -#line 358 "compile.y" +#line 369 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 48: -#line 362 "compile.y" +#line 373 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ @@ -1689,7 +1700,7 @@ yyreduce: break; case 52: -#line 370 "compile.y" +#line 381 "compile.y" { yyval=N(); ArrayOperation* diving_code=yyvsp[0]; @@ -1702,8 +1713,6 @@ yyreduce: /* skip over... */ diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/); } else { - if(first_name && *first_name==RESULT_VAR_NAME) - PC.write_to_result=true; O(*yyval, OP::OP_WITH_ROOT); /* stack: starting context */ P(*yyval, *diving_code); } @@ -1712,7 +1721,7 @@ yyreduce: break; case 53: -#line 389 "compile.y" +#line 398 "compile.y" { yyval=N(); O(*yyval, OP::OP_WITH_WRITE); /* stack: starting context */ @@ -1721,12 +1730,12 @@ yyreduce: break; case 54: -#line 394 "compile.y" +#line 403 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 58: -#line 401 "compile.y" +#line 410 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1734,14 +1743,14 @@ yyreduce: break; case 59: -#line 404 "compile.y" +#line 413 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 60: -#line 406 "compile.y" +#line 415 "compile.y" { // stack: context, name yyval=yyvsp[-2]; // stack: context, name, value @@ -1750,7 +1759,7 @@ yyreduce: break; case 61: -#line 412 "compile.y" +#line 421 "compile.y" { yyval=N(); O(*yyval, OP::OP_PREPARE_TO_EXPRESSION); @@ -1761,7 +1770,7 @@ yyreduce: break; case 62: -#line 420 "compile.y" +#line 429 "compile.y" { // stack: context, name yyval=N(); @@ -1770,7 +1779,7 @@ yyreduce: break; case 66: -#line 431 "compile.y" +#line 440 "compile.y" { yyval=N(); OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1780,12 +1789,12 @@ yyreduce: break; case 69: -#line 438 "compile.y" +#line 447 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 70: -#line 442 "compile.y" +#line 451 "compile.y" { yyval=yyvsp[0]; /* stack: value */ changetail_or_append(*yyval, @@ -1795,21 +1804,21 @@ yyreduce: break; case 71: -#line 448 "compile.y" +#line 457 "compile.y" { PC.in_call_value=true; ;} break; case 72: -#line 451 "compile.y" +#line 460 "compile.y" { PC.in_call_value=false; ;} break; case 73: -#line 454 "compile.y" +#line 463 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ @@ -1825,12 +1834,12 @@ yyreduce: break; case 76: -#line 469 "compile.y" +#line 478 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 80: -#line 475 "compile.y" +#line 484 "compile.y" { // allow ^call[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1838,44 +1847,44 @@ yyreduce: break; case 81: -#line 478 "compile.y" +#line 487 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 82: -#line 480 "compile.y" +#line 489 "compile.y" {yyval=yyvsp[-2];} break; case 83: -#line 481 "compile.y" +#line 490 "compile.y" {yyval=yyvsp[-1];} break; case 84: -#line 482 "compile.y" +#line 491 "compile.y" {yyval=yyvsp[-1];} break; case 86: -#line 485 "compile.y" +#line 494 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 88: -#line 489 "compile.y" +#line 498 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 90: -#line 493 "compile.y" +#line 502 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;} break; case 91: -#line 495 "compile.y" +#line 504 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_STORE_PARAM); @@ -1883,7 +1892,7 @@ yyreduce: break; case 92: -#line 499 "compile.y" +#line 508 "compile.y" { YYSTYPE expr_code=yyvsp[0]; if(expr_code->count()==3 @@ -1902,7 +1911,7 @@ yyreduce: break; case 93: -#line 514 "compile.y" +#line 523 "compile.y" { yyval=N(); OA(*yyval, OP::OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); @@ -1910,17 +1919,17 @@ yyreduce: break; case 98: -#line 526 "compile.y" +#line 535 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 100: -#line 528 "compile.y" +#line 537 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 102: -#line 530 "compile.y" +#line 539 "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 @@ -1932,7 +1941,7 @@ yyreduce: break; case 103: -#line 538 "compile.y" +#line 547 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ @@ -1941,7 +1950,7 @@ yyreduce: break; case 109: -#line 551 "compile.y" +#line 560 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT); @@ -1949,7 +1958,7 @@ yyreduce: break; case 110: -#line 555 "compile.y" +#line 564 "compile.y" { ArrayOperation* code; { @@ -1962,7 +1971,7 @@ yyreduce: break; case 111: -#line 564 "compile.y" +#line 573 "compile.y" { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&yyval)=PC.explicit_result; PC.explicit_result=false; @@ -1970,14 +1979,14 @@ yyreduce: break; case 112: -#line 567 "compile.y" +#line 576 "compile.y" { PC.explicit_result=*reinterpret_cast(&yyvsp[-1]); ;} break; case 113: -#line 569 "compile.y" +#line 578 "compile.y" { yyval=N(); OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */ @@ -1987,7 +1996,7 @@ yyreduce: break; case 114: -#line 575 "compile.y" +#line 584 "compile.y" { yyval=N(); O(*yyval, OP::OP_WITH_READ); @@ -1996,12 +2005,12 @@ yyreduce: break; case 116: -#line 580 "compile.y" +#line 589 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;} break; case 117: -#line 581 "compile.y" +#line 590 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_GET_ELEMENT__WRITE); @@ -2009,7 +2018,7 @@ yyreduce: break; case 120: -#line 590 "compile.y" +#line 599 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class @@ -2020,12 +2029,17 @@ yyreduce: YYERROR; } } +#ifdef OPTIMIZE_BYTECODE_GET_CLASS + // OP_VALUE+origin+string+OP_GET_CLASS -> OP_VALUE__GET_CLASS+origin+string + replace_top_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 602 "compile.y" +#line 616 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -2037,197 +2051,197 @@ yyreduce: break; case 128: -#line 621 "compile.y" +#line 635 "compile.y" { yyval = yyvsp[-1] ;} break; case 129: -#line 622 "compile.y" +#line 636 "compile.y" { yyval = yyvsp[-1] ;} break; case 130: -#line 623 "compile.y" +#line 637 "compile.y" { yyval = yyvsp[-1]; ;} break; case 131: -#line 625 "compile.y" +#line 639 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_NEG) ;} break; case 132: -#line 626 "compile.y" +#line 640 "compile.y" { yyval=yyvsp[0] ;} break; case 133: -#line 627 "compile.y" +#line 641 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_INV) ;} break; case 134: -#line 628 "compile.y" +#line 642 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_NOT) ;} break; case 135: -#line 629 "compile.y" +#line 643 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_DEF) ;} break; case 136: -#line 630 "compile.y" +#line 644 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_IN) ;} break; case 137: -#line 631 "compile.y" +#line 645 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_FEXISTS) ;} break; case 138: -#line 632 "compile.y" +#line 646 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP::OP_DEXISTS) ;} break; case 139: -#line 634 "compile.y" +#line 648 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_SUB) ;} break; case 140: -#line 635 "compile.y" +#line 649 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_ADD) ;} break; case 141: -#line 636 "compile.y" +#line 650 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MUL) ;} break; case 142: -#line 637 "compile.y" +#line 651 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_DIV) ;} break; case 143: -#line 638 "compile.y" +#line 652 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_MOD) ;} break; case 144: -#line 639 "compile.y" +#line 653 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_INTDIV) ;} break; case 145: -#line 640 "compile.y" +#line 654 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SL) ;} break; case 146: -#line 641 "compile.y" +#line 655 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_SR) ;} break; case 147: -#line 642 "compile.y" +#line 656 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_AND) ;} break; case 148: -#line 643 "compile.y" +#line 657 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_OR) ;} break; case 149: -#line 644 "compile.y" +#line 658 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_BIN_XOR) ;} break; case 150: -#line 645 "compile.y" +#line 659 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_AND) ;} break; case 151: -#line 646 "compile.y" +#line 660 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP::OP_LOG_OR) ;} break; case 152: -#line 647 "compile.y" +#line 661 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_LOG_XOR) ;} break; case 153: -#line 648 "compile.y" +#line 662 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LT) ;} break; case 154: -#line 649 "compile.y" +#line 663 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GT) ;} break; case 155: -#line 650 "compile.y" +#line 664 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_LE) ;} break; case 156: -#line 651 "compile.y" +#line 665 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_GE) ;} break; case 157: -#line 652 "compile.y" +#line 666 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_EQ) ;} break; case 158: -#line 653 "compile.y" +#line 667 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_NUM_NE) ;} break; case 159: -#line 654 "compile.y" +#line 668 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LT) ;} break; case 160: -#line 655 "compile.y" +#line 669 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GT) ;} break; case 161: -#line 656 "compile.y" +#line 670 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_LE) ;} break; case 162: -#line 657 "compile.y" +#line 671 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_GE) ;} break; case 163: -#line 658 "compile.y" +#line 672 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_EQ) ;} break; case 164: -#line 659 "compile.y" +#line 673 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_STR_NE) ;} break; case 165: -#line 660 "compile.y" +#line 674 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP::OP_IS) ;} break; case 166: -#line 663 "compile.y" +#line 677 "compile.y" { // optimized from OP_STRING->OP_VALUE for doubles maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0])); @@ -2235,7 +2249,7 @@ yyreduce: break; case 167: -#line 668 "compile.y" +#line 682 "compile.y" { yyval=N(); OA(*yyval, OP::OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ @@ -2245,7 +2259,7 @@ yyreduce: break; case 168: -#line 677 "compile.y" +#line 691 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) @@ -2253,22 +2267,22 @@ yyreduce: break; case 169: -#line 682 "compile.y" +#line 696 "compile.y" { yyval=VL(/*we know that we will not change it*/const_cast(&vvoid), 0, 0, 0) ;} break; case 170: -#line 683 "compile.y" +#line 697 "compile.y" { yyval = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0) ;} break; case 171: -#line 684 "compile.y" +#line 698 "compile.y" { yyval = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0) ;} break; case 172: -#line 686 "compile.y" +#line 700 "compile.y" { yyval=N() ;} break; @@ -2276,7 +2290,7 @@ yyreduce: } /* Line 1010 of yacc.c. */ -#line 2280 "compile.tab.C" +#line 2294 "compile.tab.C" yyvsp -= yylen; yyssp -= yylen; @@ -2501,7 +2515,7 @@ yyreturn: } -#line 688 "compile.y" +#line 702 "compile.y" #endif