From 1162210ee4c382e11e415c2bc71f692c7b88e1dd Mon Sep 17 00:00:00 2001 From: Zefram Date: Tue, 21 Jun 2011 08:58:34 +0100 Subject: remove deprecated qw-as-parens behaviour --- embed.fnc | 2 - embed.h | 1 - perly.act | 440 +++++++++---------- perly.h | 44 +- perly.tab | 1165 +++++++++++++++++++++++++------------------------- perly.y | 50 +-- pod/perldiag.pod | 11 - proto.h | 5 - t/lib/warnings/perly | 236 ---------- toke.c | 17 - 10 files changed, 836 insertions(+), 1135 deletions(-) diff --git a/embed.fnc b/embed.fnc index 71c10af6d7..09c3279abb 100644 --- a/embed.fnc +++ b/embed.fnc @@ -2451,8 +2451,6 @@ xpoM |void|store_cop_label \ |NN COP *const cop|NN const char *label|STRLEN len|U32 flags xpo |int |keyword_plugin_standard|NN char* keyword_ptr|STRLEN keyword_len|NN OP** op_ptr -: Used in perly.y -xp |void |munge_qwlist_to_paren_list|NN OP* qwlist #if defined(USE_ITHREADS) # if defined(PERL_IN_SV_C) diff --git a/embed.h b/embed.h index 77373e1b01..3301260de4 100644 --- a/embed.h +++ b/embed.h @@ -1084,7 +1084,6 @@ #define mode_from_discipline(a,b) Perl_mode_from_discipline(aTHX_ a,b) #define mro_isa_changed_in(a) Perl_mro_isa_changed_in(aTHX_ a) #define mro_package_moved(a,b,c,d) Perl_mro_package_moved(aTHX_ a,b,c,d) -#define munge_qwlist_to_paren_list(a) Perl_munge_qwlist_to_paren_list(aTHX_ a) #define my_attrs(a,b) Perl_my_attrs(aTHX_ a,b) #define my_clearenv() Perl_my_clearenv(aTHX) #define my_lstat_flags(a) Perl_my_lstat_flags(aTHX_ a) diff --git a/perly.act b/perly.act index 32f9b825f7..5edaceb061 100644 --- a/perly.act +++ b/perly.act @@ -5,14 +5,14 @@ */ case 2: -#line 142 "perly.y" +#line 140 "perly.y" { PL_parser->expect = XSTATE; ;} break; case 3: -#line 146 "perly.y" +#line 144 "perly.y" { newPROG(block_end((ps[(3) - (4)].val.ival),(ps[(4) - (4)].val.opval))); (yyval.ival) = 0; @@ -20,14 +20,14 @@ case 2: break; case 4: -#line 151 "perly.y" +#line 149 "perly.y" { parser->expect = XTERM; ;} break; case 5: -#line 155 "perly.y" +#line 153 "perly.y" { PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; @@ -35,14 +35,14 @@ case 2: break; case 6: -#line 160 "perly.y" +#line 158 "perly.y" { parser->expect = XBLOCK; ;} break; case 7: -#line 164 "perly.y" +#line 162 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); @@ -53,14 +53,14 @@ case 2: break; case 8: -#line 172 "perly.y" +#line 170 "perly.y" { parser->expect = XSTATE; ;} break; case 9: -#line 176 "perly.y" +#line 174 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); @@ -71,14 +71,14 @@ case 2: break; case 10: -#line 184 "perly.y" +#line 182 "perly.y" { parser->expect = XSTATE; ;} break; case 11: -#line 188 "perly.y" +#line 186 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); @@ -89,14 +89,14 @@ case 2: break; case 12: -#line 196 "perly.y" +#line 194 "perly.y" { parser->expect = XSTATE; ;} break; case 13: -#line 200 "perly.y" +#line 198 "perly.y" { PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; @@ -104,7 +104,7 @@ case 2: break; case 14: -#line 208 "perly.y" +#line 206 "perly.y" { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval))) PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval)); (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval)); @@ -114,17 +114,17 @@ case 2: break; case 15: -#line 217 "perly.y" +#line 215 "perly.y" { (yyval.ival) = block_start(TRUE); ;} break; case 16: -#line 221 "perly.y" +#line 219 "perly.y" { (yyval.ival) = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); ;} break; case 17: -#line 225 "perly.y" +#line 223 "perly.y" { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval))) PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval)); (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval)); @@ -134,17 +134,17 @@ case 2: break; case 18: -#line 234 "perly.y" +#line 232 "perly.y" { (yyval.ival) = block_start(FALSE); ;} break; case 19: -#line 239 "perly.y" +#line 237 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 20: -#line 241 "perly.y" +#line 239 "perly.y" { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval)); PL_pad_reset_pending = TRUE; if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval)) @@ -153,7 +153,7 @@ case 2: break; case 21: -#line 250 "perly.y" +#line 248 "perly.y" { if((ps[(1) - (1)].val.opval)) { (yyval.opval) = newSTATEOP(0, NULL, (ps[(1) - (1)].val.opval)); @@ -164,12 +164,12 @@ case 2: break; case 22: -#line 258 "perly.y" +#line 256 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 23: -#line 262 "perly.y" +#line 260 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval), @@ -178,7 +178,7 @@ case 2: break; case 24: -#line 268 "perly.y" +#line 266 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval), cLISTOPx((yyval.opval))->op_first, 'L'); @@ -186,12 +186,12 @@ case 2: break; case 25: -#line 276 "perly.y" +#line 274 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 26: -#line 278 "perly.y" +#line 276 "perly.y" { (yyval.opval) = newOP(OP_NULL,0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p'); @@ -199,7 +199,7 @@ case 2: break; case 27: -#line 283 "perly.y" +#line 281 "perly.y" { CV *fmtcv = PL_compcv; SvREFCNT_inc_simple_void(PL_compcv); @@ -220,7 +220,7 @@ case 2: break; case 28: -#line 301 "perly.y" +#line 299 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD @@ -244,7 +244,7 @@ case 2: break; case 29: -#line 322 "perly.y" +#line 320 "perly.y" { /* Unimplemented "my sub foo { }" */ SvREFCNT_inc_simple_void(PL_compcv); @@ -259,7 +259,7 @@ case 2: break; case 30: -#line 334 "perly.y" +#line 332 "perly.y" { #ifdef MAD (yyval.opval) = package((ps[(3) - (4)].val.opval)); @@ -277,12 +277,12 @@ case 2: break; case 31: -#line 349 "perly.y" +#line 347 "perly.y" { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} break; case 32: -#line 351 "perly.y" +#line 349 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD @@ -300,7 +300,7 @@ case 2: break; case 33: -#line 366 "perly.y" +#line 364 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -312,7 +312,7 @@ case 2: break; case 34: -#line 375 "perly.y" +#line 373 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -324,7 +324,7 @@ case 2: break; case 35: -#line 384 "perly.y" +#line 382 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newGIVENOP((ps[(5) - (7)].val.opval), op_scope((ps[(7) - (7)].val.opval)), (PADOFFSET)(ps[(4) - (7)].val.ival))); @@ -333,17 +333,17 @@ case 2: break; case 36: -#line 390 "perly.y" +#line 388 "perly.y" { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;} break; case 37: -#line 392 "perly.y" +#line 390 "perly.y" { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;} break; case 38: -#line 394 "perly.y" +#line 392 "perly.y" { (yyval.opval) = block_end((ps[(3) - (8)].val.ival), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -356,7 +356,7 @@ case 2: break; case 39: -#line 404 "perly.y" +#line 402 "perly.y" { (yyval.opval) = block_end((ps[(3) - (8)].val.ival), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -369,7 +369,7 @@ case 2: break; case 40: -#line 415 "perly.y" +#line 413 "perly.y" { OP *initop = IF_MAD((ps[(4) - (11)].val.opval) ? (ps[(4) - (11)].val.opval) : newOP(OP_NULL, 0), (ps[(4) - (11)].val.opval)); OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -392,7 +392,7 @@ case 2: break; case 41: -#line 435 "perly.y" +#line 433 "perly.y" { (yyval.opval) = block_end((ps[(3) - (9)].val.ival), newFOROP(0, (ps[(4) - (9)].val.opval), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval))); TOKEN_GETMAD((ps[(1) - (9)].val.i_tkval),(yyval.opval),'W'); @@ -404,7 +404,7 @@ case 2: break; case 42: -#line 444 "perly.y" +#line 442 "perly.y" { (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newFOROP(0, op_lvalue((ps[(2) - (8)].val.opval), OP_ENTERLOOP), (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval))); @@ -416,7 +416,7 @@ case 2: break; case 43: -#line 453 "perly.y" +#line 451 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newFOROP(0, (OP*)NULL, (ps[(4) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval))); @@ -428,7 +428,7 @@ case 2: break; case 44: -#line 462 "perly.y" +#line 460 "perly.y" { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -437,7 +437,7 @@ case 2: break; case 45: -#line 468 "perly.y" +#line 466 "perly.y" { int save_3_latefree = (ps[(3) - (5)].val.opval)->op_latefree; (ps[(3) - (5)].val.opval)->op_latefree = 1; @@ -453,7 +453,7 @@ case 2: break; case 46: -#line 481 "perly.y" +#line 479 "perly.y" { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -469,7 +469,7 @@ case 2: break; case 47: -#line 494 "perly.y" +#line 492 "perly.y" { PL_parser->expect = XSTATE; (yyval.opval) = (ps[(1) - (2)].val.opval); @@ -478,7 +478,7 @@ case 2: break; case 48: -#line 500 "perly.y" +#line 498 "perly.y" { PL_parser->expect = XSTATE; (yyval.opval) = IF_MAD(newOP(OP_NULL, 0), (OP*)NULL); @@ -488,45 +488,45 @@ case 2: break; case 49: -#line 510 "perly.y" +#line 508 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 50: -#line 512 "perly.y" +#line 510 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 51: -#line 514 "perly.y" +#line 512 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i'); ;} break; case 52: -#line 518 "perly.y" +#line 516 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i'); ;} break; case 53: -#line 522 "perly.y" +#line 520 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); ;} break; case 54: -#line 526 "perly.y" +#line 524 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); ;} break; case 55: -#line 530 "perly.y" +#line 528 "perly.y" { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); PL_parser->copline = (line_t)IVAL((ps[(2) - (3)].val.i_tkval)); @@ -534,17 +534,17 @@ case 2: break; case 56: -#line 535 "perly.y" +#line 533 "perly.y" { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;} break; case 57: -#line 540 "perly.y" +#line 538 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 58: -#line 542 "perly.y" +#line 540 "perly.y" { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); @@ -553,7 +553,7 @@ case 2: break; case 59: -#line 548 "perly.y" +#line 546 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval)); (yyval.opval) = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)), @@ -566,12 +566,12 @@ case 2: break; case 60: -#line 561 "perly.y" +#line 559 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 61: -#line 563 "perly.y" +#line 561 "perly.y" { (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); @@ -579,74 +579,74 @@ case 2: break; case 62: -#line 571 "perly.y" +#line 569 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); ;} break; case 63: -#line 577 "perly.y" +#line 575 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 65: -#line 583 "perly.y" +#line 581 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; ;} break; case 67: -#line 591 "perly.y" +#line 589 "perly.y" { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} break; case 68: -#line 596 "perly.y" +#line 594 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; case 69: -#line 600 "perly.y" +#line 598 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; case 70: -#line 604 "perly.y" +#line 602 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; case 71: -#line 607 "perly.y" +#line 605 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 72: -#line 608 "perly.y" +#line 606 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 73: -#line 612 "perly.y" +#line 610 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); ;} break; case 74: -#line 618 "perly.y" +#line 616 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); ;} break; case 75: -#line 623 "perly.y" +#line 621 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); ;} break; case 76: -#line 628 "perly.y" +#line 626 "perly.y" { const char *const name = SvPV_nolen_const(((SVOP*)(ps[(1) - (1)].val.opval))->op_sv); if (strEQ(name, "BEGIN") || strEQ(name, "END") || strEQ(name, "INIT") || strEQ(name, "CHECK") @@ -656,24 +656,24 @@ case 2: break; case 77: -#line 638 "perly.y" +#line 636 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 79: -#line 644 "perly.y" +#line 642 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 80: -#line 646 "perly.y" +#line 644 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; case 81: -#line 650 "perly.y" +#line 648 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -683,14 +683,14 @@ case 2: break; case 82: -#line 660 "perly.y" +#line 658 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; case 83: -#line 664 "perly.y" +#line 662 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -700,12 +700,12 @@ case 2: break; case 84: -#line 673 "perly.y" +#line 671 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 85: -#line 674 "perly.y" +#line 672 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL,0), (OP*)NULL @@ -716,28 +716,28 @@ case 2: break; case 86: -#line 685 "perly.y" +#line 683 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 87: -#line 689 "perly.y" +#line 687 "perly.y" { (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 88: -#line 693 "perly.y" +#line 691 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 90: -#line 701 "perly.y" +#line 699 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -750,7 +750,7 @@ case 2: break; case 91: -#line 711 "perly.y" +#line 709 "perly.y" { OP* term = (ps[(3) - (3)].val.opval); DO_MAD( @@ -762,7 +762,7 @@ case 2: break; case 93: -#line 724 "perly.y" +#line 722 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) ); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); @@ -770,7 +770,7 @@ case 2: break; case 94: -#line 729 "perly.y" +#line 727 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (5)].val.i_tkval)),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) ); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); @@ -780,7 +780,7 @@ case 2: break; case 95: -#line 736 "perly.y" +#line 734 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)), @@ -792,7 +792,7 @@ case 2: break; case 96: -#line 745 "perly.y" +#line 743 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)), newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval)))); @@ -801,7 +801,7 @@ case 2: break; case 97: -#line 751 "perly.y" +#line 749 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)), @@ -810,7 +810,7 @@ case 2: break; case 98: -#line 757 "perly.y" +#line 755 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)), @@ -821,14 +821,14 @@ case 2: break; case 99: -#line 765 "perly.y" +#line 763 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 100: -#line 769 "perly.y" +#line 767 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'('); @@ -837,13 +837,13 @@ case 2: break; case 101: -#line 775 "perly.y" +#line 773 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;} break; case 102: -#line 778 "perly.y" +#line 776 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval))); @@ -851,7 +851,7 @@ case 2: break; case 105: -#line 793 "perly.y" +#line 791 "perly.y" { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval))); PL_parser->expect = XOPERATOR; TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); @@ -861,7 +861,7 @@ case 2: break; case 106: -#line 800 "perly.y" +#line 798 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval))); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); @@ -869,7 +869,7 @@ case 2: break; case 107: -#line 805 "perly.y" +#line 803 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV), scalar((ps[(4) - (5)].val.opval))); @@ -880,7 +880,7 @@ case 2: break; case 108: -#line 813 "perly.y" +#line 811 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV), scalar((ps[(3) - (4)].val.opval))); @@ -890,7 +890,7 @@ case 2: break; case 109: -#line 820 "perly.y" +#line 818 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval))); PL_parser->expect = XOPERATOR; TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); @@ -900,7 +900,7 @@ case 2: break; case 110: -#line 827 "perly.y" +#line 825 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV), jmaybe((ps[(4) - (6)].val.opval))); @@ -913,7 +913,7 @@ case 2: break; case 111: -#line 837 "perly.y" +#line 835 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV), jmaybe((ps[(3) - (5)].val.opval))); @@ -925,7 +925,7 @@ case 2: break; case 112: -#line 846 "perly.y" +#line 844 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[(1) - (4)].val.opval)))); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'a'); @@ -935,7 +935,7 @@ case 2: break; case 113: -#line 853 "perly.y" +#line 851 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(4) - (5)].val.opval), newCVREF(0, scalar((ps[(1) - (5)].val.opval))))); @@ -946,7 +946,7 @@ case 2: break; case 114: -#line 862 "perly.y" +#line 860 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), newCVREF(0, scalar((ps[(1) - (4)].val.opval))))); @@ -956,7 +956,7 @@ case 2: break; case 115: -#line 869 "perly.y" +#line 867 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[(1) - (3)].val.opval)))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'('); @@ -965,7 +965,7 @@ case 2: break; case 116: -#line 875 "perly.y" +#line 873 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval)); TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),')'); @@ -975,7 +975,7 @@ case 2: break; case 117: -#line 882 "perly.y" +#line 880 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (4)].val.opval)); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); @@ -983,7 +983,7 @@ case 2: break; case 118: -#line 887 "perly.y" +#line 885 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')'); @@ -993,21 +993,21 @@ case 2: break; case 119: -#line 897 "perly.y" +#line 895 "perly.y" { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 120: -#line 901 "perly.y" +#line 899 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 121: -#line 905 "perly.y" +#line 903 "perly.y" { if (IVAL((ps[(2) - (3)].val.i_tkval)) != OP_REPEAT) scalar((ps[(1) - (3)].val.opval)); (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval))); @@ -1016,49 +1016,49 @@ case 2: break; case 122: -#line 911 "perly.y" +#line 909 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 123: -#line 915 "perly.y" +#line 913 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 124: -#line 919 "perly.y" +#line 917 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 125: -#line 923 "perly.y" +#line 921 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 126: -#line 927 "perly.y" +#line 925 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 127: -#line 931 "perly.y" +#line 929 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 128: -#line 935 "perly.y" +#line 933 "perly.y" { (yyval.opval) = newRANGE(IVAL((ps[(2) - (3)].val.i_tkval)), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); DO_MAD({ @@ -1073,28 +1073,28 @@ case 2: break; case 129: -#line 947 "perly.y" +#line 945 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 130: -#line 951 "perly.y" +#line 949 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 131: -#line 955 "perly.y" +#line 953 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; case 132: -#line 959 "perly.y" +#line 957 "perly.y" { (yyval.opval) = bind_match(IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval), ((yyval.opval)->op_type == OP_NOT @@ -1104,14 +1104,14 @@ case 2: break; case 133: -#line 969 "perly.y" +#line 967 "perly.y" { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 134: -#line 973 "perly.y" +#line 971 "perly.y" { (yyval.opval) = IF_MAD( newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)), (ps[(2) - (2)].val.opval) @@ -1121,21 +1121,21 @@ case 2: break; case 135: -#line 980 "perly.y" +#line 978 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 136: -#line 984 "perly.y" +#line 982 "perly.y" { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 137: -#line 988 "perly.y" +#line 986 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); @@ -1143,7 +1143,7 @@ case 2: break; case 138: -#line 993 "perly.y" +#line 991 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); @@ -1151,7 +1151,7 @@ case 2: break; case 139: -#line 998 "perly.y" +#line 996 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); @@ -1159,7 +1159,7 @@ case 2: break; case 140: -#line 1003 "perly.y" +#line 1001 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); @@ -1167,7 +1167,7 @@ case 2: break; case 141: -#line 1012 "perly.y" +#line 1010 "perly.y" { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval)); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),']'); @@ -1175,7 +1175,7 @@ case 2: break; case 142: -#line 1017 "perly.y" +#line 1015 "perly.y" { (yyval.opval) = newANONLIST((OP*)NULL); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']'); @@ -1183,7 +1183,7 @@ case 2: break; case 143: -#line 1022 "perly.y" +#line 1020 "perly.y" { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),';'); @@ -1192,7 +1192,7 @@ case 2: break; case 144: -#line 1028 "perly.y" +#line 1026 "perly.y" { (yyval.opval) = newANONHASH((OP*)NULL); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';'); @@ -1201,7 +1201,7 @@ case 2: break; case 145: -#line 1034 "perly.y" +#line 1032 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[(2) - (5)].val.ival), (ps[(3) - (5)].val.opval), (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); @@ -1211,21 +1211,21 @@ case 2: break; case 146: -#line 1045 "perly.y" +#line 1043 "perly.y" { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), IVAL((ps[(1) - (2)].val.i_tkval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 147: -#line 1049 "perly.y" +#line 1047 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D'); ;} break; case 148: -#line 1053 "perly.y" +#line 1051 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, @@ -1240,7 +1240,7 @@ case 2: break; case 149: -#line 1065 "perly.y" +#line 1063 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_append_elem(OP_LIST, @@ -1256,7 +1256,7 @@ case 2: break; case 150: -#line 1078 "perly.y" +#line 1076 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep(); @@ -1267,7 +1267,7 @@ case 2: break; case 151: -#line 1086 "perly.y" +#line 1084 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), @@ -1279,7 +1279,7 @@ case 2: break; case 156: -#line 1102 "perly.y" +#line 1100 "perly.y" { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval)); TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'?'); TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),':'); @@ -1287,26 +1287,26 @@ case 2: break; case 157: -#line 1107 "perly.y" +#line 1105 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, op_lvalue((ps[(2) - (2)].val.opval),OP_REFGEN)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 158: -#line 1111 "perly.y" +#line 1109 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 159: -#line 1113 "perly.y" +#line 1111 "perly.y" { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'k'); ;} break; case 160: -#line 1117 "perly.y" +#line 1115 "perly.y" { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(ps[(2) - (3)].val.opval)), (ps[(2) - (3)].val.opval))); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); @@ -1314,12 +1314,12 @@ case 2: break; case 161: -#line 1122 "perly.y" +#line 1120 "perly.y" { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;} break; case 162: -#line 1124 "perly.y" +#line 1122 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')'); @@ -1327,37 +1327,37 @@ case 2: break; case 163: -#line 1129 "perly.y" +#line 1127 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 164: -#line 1131 "perly.y" +#line 1129 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 165: -#line 1133 "perly.y" +#line 1131 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 166: -#line 1135 "perly.y" +#line 1133 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 167: -#line 1137 "perly.y" +#line 1135 "perly.y" { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;} break; case 168: -#line 1139 "perly.y" +#line 1137 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 169: -#line 1141 "perly.y" +#line 1139 "perly.y" { (yyval.opval) = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1369,7 +1369,7 @@ case 2: break; case 170: -#line 1150 "perly.y" +#line 1148 "perly.y" { (yyval.opval) = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1383,17 +1383,17 @@ case 2: break; case 171: -#line 1161 "perly.y" +#line 1159 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 172: -#line 1163 "perly.y" +#line 1161 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;} break; case 173: -#line 1165 "perly.y" +#line 1163 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); @@ -1401,7 +1401,7 @@ case 2: break; case 174: -#line 1170 "perly.y" +#line 1168 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval)))); @@ -1417,7 +1417,7 @@ case 2: break; case 175: -#line 1183 "perly.y" +#line 1181 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval)))); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); @@ -1425,7 +1425,7 @@ case 2: break; case 176: -#line 1188 "perly.y" +#line 1186 "perly.y" { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), OPf_SPECIAL); PL_hints |= HINT_BLOCK_SCOPE; TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o'); @@ -1433,74 +1433,74 @@ case 2: break; case 177: -#line 1193 "perly.y" +#line 1191 "perly.y" { (yyval.opval) = newLOOPEX(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 178: -#line 1197 "perly.y" +#line 1195 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 179: -#line 1201 "perly.y" +#line 1199 "perly.y" { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o'); ;} break; case 180: -#line 1205 "perly.y" +#line 1203 "perly.y" { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 181: -#line 1209 "perly.y" +#line 1207 "perly.y" { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 182: -#line 1213 "perly.y" +#line 1211 "perly.y" { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.i_tkval) ? OPf_SPECIAL : 0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o'); ;} break; case 183: -#line 1217 "perly.y" +#line 1215 "perly.y" { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.i_tkval) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; case 184: -#line 1221 "perly.y" +#line 1219 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; case 185: -#line 1223 "perly.y" +#line 1221 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;} break; case 186: -#line 1226 "perly.y" +#line 1224 "perly.y" { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o'); ;} break; case 187: -#line 1230 "perly.y" +#line 1228 "perly.y" { (yyval.opval) = newOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'('); @@ -1509,13 +1509,13 @@ case 2: break; case 188: -#line 1236 "perly.y" +#line 1234 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; case 189: -#line 1239 "perly.y" +#line 1237 "perly.y" { (yyval.opval) = (IVAL((ps[(1) - (3)].val.i_tkval)) == OP_NOT) ? newUNOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0, newSVOP(OP_CONST, 0, newSViv(0))) : newOP(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_SPECIAL); @@ -1527,7 +1527,7 @@ case 2: break; case 190: -#line 1248 "perly.y" +#line 1246 "perly.y" { (yyval.opval) = newUNOP(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'('); @@ -1536,7 +1536,7 @@ case 2: break; case 191: -#line 1254 "perly.y" +#line 1252 "perly.y" { (yyval.opval) = pmruntime((ps[(1) - (4)].val.opval), (ps[(3) - (4)].val.opval), 1); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); @@ -1544,7 +1544,7 @@ case 2: break; case 194: -#line 1261 "perly.y" +#line 1259 "perly.y" { (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); @@ -1553,7 +1553,7 @@ case 2: break; case 196: -#line 1271 "perly.y" +#line 1269 "perly.y" { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval)); DO_MAD( token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'d'); @@ -1564,14 +1564,14 @@ case 2: break; case 197: -#line 1279 "perly.y" +#line 1277 "perly.y" { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'d'); ;} break; case 198: -#line 1286 "perly.y" +#line 1284 "perly.y" { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); @@ -1579,7 +1579,7 @@ case 2: break; case 199: -#line 1291 "perly.y" +#line 1289 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')'); @@ -1587,129 +1587,111 @@ case 2: break; case 200: -#line 1296 "perly.y" +#line 1294 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 201: -#line 1298 "perly.y" +#line 1296 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 202: -#line 1300 "perly.y" +#line 1298 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 203: -#line 1305 "perly.y" +#line 1303 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 204: -#line 1307 "perly.y" +#line 1305 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 205: -#line 1311 "perly.y" +#line 1309 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 206: -#line 1313 "perly.y" +#line 1311 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 207: #line 1317 "perly.y" - { (yyval.i_tkval) = (ps[(1) - (1)].val.i_tkval); ;} + { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} break; case 208: -#line 1319 "perly.y" - { munge_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;} - break; - - case 209: #line 1321 "perly.y" - { (yyval.i_tkval) = (ps[(3) - (3)].val.i_tkval); ;} - break; - - case 210: -#line 1327 "perly.y" - { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} - break; - - case 211: -#line 1331 "perly.y" { (yyval.opval) = newCVREF(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'&'); ;} break; - case 212: -#line 1337 "perly.y" + case 209: +#line 1327 "perly.y" { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$'); ;} break; - case 213: -#line 1343 "perly.y" + case 210: +#line 1333 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@'); ;} break; - case 214: -#line 1349 "perly.y" + case 211: +#line 1339 "perly.y" { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%'); ;} break; - case 215: -#line 1355 "perly.y" + case 212: +#line 1345 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l'); ;} break; - case 216: -#line 1361 "perly.y" + case 213: +#line 1351 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*'); ;} break; - case 217: -#line 1368 "perly.y" + case 214: +#line 1358 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 218: -#line 1370 "perly.y" + case 215: +#line 1360 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 219: -#line 1372 "perly.y" + case 216: +#line 1362 "perly.y" { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;} break; - case 220: -#line 1375 "perly.y" + case 217: +#line 1365 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - -/* Line 1267 of yacc.c. */ - default: break; /* Generated from: - * dbb2439b7793bc662fb61a937ef279c1e367658eb7b8755c88b0e9c61116ed55 perly.y + * 1af5c1e4d01014cbed653334fdeeda12fe7b75b193865ba9ea67e0ad9606413b perly.y * 738ca60a0b4cb075902435e976a2f393d438e8e6e32ba81e037dd773b75c87b5 regen_perly.pl * ex: set ro: */ diff --git a/perly.h b/perly.h index 63dedf7676..a3d5b851b7 100644 --- a/perly.h +++ b/perly.h @@ -5,27 +5,26 @@ */ #ifdef PERL_CORE -/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* A Bison parser, made by GNU Bison 2.4.1. */ - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify + + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -36,10 +35,11 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ + /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -126,6 +126,7 @@ PEG = 335 }; #endif + /* Tokens. */ #define GRAMPROG 258 #define GRAMEXPR 259 @@ -208,11 +209,13 @@ - #endif /* PERL_CORE */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { + +/* Line 1676 of yacc.c */ + I32 ival; /* __DEFAULT__ (marker for regen_perly.pl; must always be 1st union member) */ char *pval; @@ -228,18 +231,21 @@ typedef union YYSTYPE #ifdef PERL_MAD TOKEN* tkval; #endif -} -/* Line 1529 of yacc.c. */ - YYSTYPE; + + + +/* Line 1676 of yacc.c */ +} YYSTYPE; +# define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 #endif + /* Generated from: - * dbb2439b7793bc662fb61a937ef279c1e367658eb7b8755c88b0e9c61116ed55 perly.y + * 1af5c1e4d01014cbed653334fdeeda12fe7b75b193865ba9ea67e0ad9606413b perly.y * 738ca60a0b4cb075902435e976a2f393d438e8e6e32ba81e037dd773b75c87b5 regen_perly.pl * ex: set ro: */ diff --git a/perly.tab b/perly.tab index 171faf8c69..0ce15494cf 100644 --- a/perly.tab +++ b/perly.tab @@ -6,16 +6,16 @@ #define YYFINAL 14 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2683 +#define YYLAST 2699 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 100 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 63 +#define YYNNTS 61 /* YYNRULES -- Number of rules. */ -#define YYNRULES 220 +#define YYNRULES 217 /* YYNRULES -- Number of states. */ -#define YYNSTATES 446 +#define YYNSTATES 442 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -88,9 +88,8 @@ static const yytype_uint16 yyprhs[] = 621, 627, 629, 631, 635, 640, 644, 646, 649, 652, 654, 657, 660, 662, 665, 667, 670, 672, 676, 678, 682, 687, 692, 694, 696, 698, 700, 704, 707, 711, - 714, 716, 718, 720, 721, 723, 724, 726, 728, 729, - 733, 735, 738, 741, 744, 747, 750, 753, 755, 757, - 759 + 714, 716, 718, 720, 721, 723, 724, 726, 728, 731, + 734, 737, 740, 743, 746, 748, 750, 752 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -105,40 +104,40 @@ static const yytype_int16 yyrhs[] = -1, 32, -1, 99, -1, 34, 132, 129, 108, -1, 35, 130, 133, 134, 135, 137, -1, 68, 130, 133, 134, 135, 137, -1, 37, 21, 21, 20, -1, -1, - 38, 130, 117, 21, 21, 151, 20, -1, 41, 153, - 109, 126, 97, 111, 120, -1, 42, 153, 109, 128, - 97, 111, 120, -1, 47, 153, 109, 110, 126, 97, - 111, -1, 48, 153, 109, 126, 97, 111, -1, 49, - 108, -1, 39, 153, 109, 124, 97, 122, 111, 121, - -1, 40, 153, 109, 125, 97, 122, 111, 121, -1, - 46, 153, 109, 127, 20, 124, 20, 122, 127, 97, - 111, -1, 46, 67, 109, 155, 153, 126, 97, 111, - 121, -1, 46, 157, 153, 109, 126, 97, 111, 121, - -1, 46, 153, 109, 126, 97, 111, 121, -1, 108, + 38, 130, 117, 21, 21, 151, 20, -1, 41, 98, + 109, 126, 97, 111, 120, -1, 42, 98, 109, 128, + 97, 111, 120, -1, 47, 98, 109, 110, 126, 97, + 111, -1, 48, 98, 109, 126, 97, 111, -1, 49, + 108, -1, 39, 98, 109, 124, 97, 122, 111, 121, + -1, 40, 98, 109, 125, 97, 122, 111, 121, -1, + 46, 98, 109, 127, 20, 124, 20, 122, 127, 97, + 111, -1, 46, 67, 109, 153, 98, 126, 97, 111, + 121, -1, 46, 155, 98, 109, 126, 97, 111, 121, + -1, 46, 98, 109, 126, 97, 111, 121, -1, 108, 121, -1, -1, 37, 21, 21, 9, 109, 118, 113, 10, -1, 119, 20, -1, 20, -1, 1, -1, 138, -1, 138, 41, 138, -1, 138, 42, 138, -1, 138, 39, 138, -1, 138, 40, 125, -1, 138, 46, 138, -1, 138, 48, 138, -1, -1, 43, 111, -1, 44, - 153, 126, 97, 111, 120, -1, -1, 45, 108, -1, + 98, 126, 97, 111, 120, -1, -1, 45, 108, -1, -1, -1, 119, -1, -1, 138, -1, 138, -1, 138, -1, 123, -1, 125, -1, 21, -1, -1, -1, -1, -1, 21, -1, -1, 24, -1, -1, 70, 24, -1, 70, -1, 70, 24, -1, 70, -1, 108, -1, 20, -1, 138, 74, 138, -1, 138, 73, 138, -1, 138, 72, 138, -1, 139, -1, 139, 76, -1, 139, 76, - 148, -1, 148, -1, 57, 162, 139, -1, 55, 98, - 162, 138, 97, -1, 148, 96, 142, 153, 152, 97, - -1, 148, 96, 142, -1, 22, 162, 151, -1, 23, - 162, 98, 152, 97, -1, 57, 151, -1, 55, 98, + 148, -1, 148, -1, 57, 160, 139, -1, 55, 98, + 160, 138, 97, -1, 148, 96, 142, 98, 152, 97, + -1, 148, 96, 142, -1, 22, 160, 151, -1, 23, + 160, 98, 152, 97, -1, 57, 151, -1, 55, 98, 152, 97, -1, -1, 30, 131, 108, 141, 151, -1, - 22, -1, 157, -1, 161, 9, 138, 20, 10, -1, - 157, 11, 138, 12, -1, 148, 96, 11, 138, 12, - -1, 143, 11, 138, 12, -1, 157, 9, 138, 20, + 22, -1, 155, -1, 159, 9, 138, 20, 10, -1, + 155, 11, 138, 12, -1, 148, 96, 11, 138, 12, + -1, 143, 11, 138, 12, -1, 155, 9, 138, 20, 10, -1, 148, 96, 9, 138, 20, 10, -1, 143, 9, 138, 20, 10, -1, 148, 96, 98, 97, -1, - 148, 96, 98, 138, 97, -1, 143, 153, 138, 97, - -1, 143, 153, 97, -1, 98, 138, 97, 11, 138, + 148, 96, 98, 138, 97, -1, 143, 98, 138, 97, + -1, 143, 98, 97, -1, 98, 138, 97, 11, 138, 12, -1, 27, 11, 138, 12, -1, 98, 97, 11, 138, 12, -1, 148, 77, 148, -1, 148, 91, 148, -1, 148, 60, 148, -1, 148, 61, 148, -1, 148, @@ -151,15 +150,15 @@ static const yytype_int16 yyrhs[] = 94, 148, -1, 11, 138, 12, -1, 11, 12, -1, 64, 138, 20, 10, -1, 64, 20, 10, -1, 36, 131, 134, 135, 108, -1, 63, 148, -1, 63, 108, - -1, 63, 21, 153, 97, -1, 63, 21, 153, 138, - 97, -1, 63, 157, 153, 97, -1, 63, 157, 153, + -1, 63, 21, 98, 97, -1, 63, 21, 98, 138, + 97, -1, 63, 155, 98, 97, -1, 63, 155, 98, 138, 97, -1, 144, -1, 145, -1, 146, -1, 147, -1, 148, 78, 148, 79, 148, -1, 89, 148, -1, 149, -1, 66, 148, -1, 98, 138, 97, -1, 27, - -1, 98, 97, -1, 157, -1, 161, -1, 159, -1, - 158, -1, 160, -1, 143, -1, 158, 11, 138, 12, - -1, 158, 9, 138, 20, 10, -1, 24, -1, 156, - -1, 156, 153, 97, -1, 156, 153, 138, 97, -1, + -1, 98, 97, -1, 155, -1, 159, -1, 157, -1, + 156, -1, 158, -1, 143, -1, 156, 11, 138, 12, + -1, 156, 9, 138, 20, 10, -1, 24, -1, 154, + -1, 154, 98, 97, -1, 154, 98, 138, 97, -1, 65, 21, 151, -1, 50, -1, 50, 148, -1, 75, 139, -1, 56, -1, 56, 108, -1, 56, 148, -1, 69, -1, 69, 148, -1, 29, -1, 29, 148, -1, @@ -167,40 +166,38 @@ static const yytype_int16 yyrhs[] = 97, -1, 54, 98, 138, 97, -1, 25, 98, 139, 97, -1, 21, -1, 140, -1, 52, -1, 31, -1, 67, 150, 136, -1, 67, 150, -1, 98, 138, 97, - -1, 98, 97, -1, 157, -1, 159, -1, 158, -1, - -1, 139, -1, -1, 138, -1, 98, -1, -1, 27, - 154, 98, -1, 157, -1, 19, 162, -1, 15, 162, - -1, 16, 162, -1, 17, 162, -1, 62, 162, -1, - 18, 162, -1, 21, -1, 157, -1, 108, -1, 26, - -1 + -1, 98, 97, -1, 155, -1, 157, -1, 156, -1, + -1, 139, -1, -1, 138, -1, 155, -1, 19, 160, + -1, 15, 160, -1, 16, 160, -1, 17, 160, -1, + 62, 160, -1, 18, 160, -1, 21, -1, 155, -1, + 108, -1, 26, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 142, 142, 141, 151, 150, 160, 159, 172, 171, - 184, 183, 196, 195, 207, 217, 221, 224, 234, 239, - 240, 249, 257, 261, 267, 275, 277, 282, 300, 321, - 333, 349, 348, 365, 374, 383, 389, 391, 393, 403, - 413, 434, 443, 452, 461, 468, 467, 493, 499, 509, - 511, 513, 517, 521, 525, 529, 534, 540, 541, 547, - 561, 562, 571, 577, 578, 583, 586, 590, 595, 599, - 603, 607, 608, 612, 618, 623, 628, 638, 639, 644, - 645, 649, 659, 663, 673, 674, 684, 688, 692, 696, - 700, 710, 719, 723, 728, 735, 744, 750, 756, 764, - 768, 775, 774, 785, 786, 790, 799, 804, 812, 819, - 826, 836, 845, 852, 861, 868, 874, 881, 886, 896, - 900, 904, 910, 914, 918, 922, 926, 930, 934, 946, - 950, 954, 958, 968, 972, 979, 983, 987, 992, 997, - 1002, 1011, 1016, 1021, 1027, 1033, 1044, 1048, 1052, 1064, - 1077, 1085, 1097, 1098, 1099, 1100, 1101, 1106, 1110, 1112, - 1116, 1121, 1123, 1128, 1130, 1132, 1134, 1136, 1138, 1140, - 1149, 1160, 1162, 1164, 1169, 1182, 1187, 1192, 1196, 1200, - 1204, 1208, 1212, 1216, 1220, 1222, 1225, 1229, 1235, 1238, - 1247, 1253, 1258, 1259, 1260, 1266, 1270, 1278, 1285, 1290, - 1295, 1297, 1299, 1304, 1306, 1311, 1312, 1316, 1319, 1318, - 1326, 1330, 1336, 1342, 1348, 1354, 1360, 1367, 1369, 1371, - 1374 + 0, 140, 140, 139, 149, 148, 158, 157, 170, 169, + 182, 181, 194, 193, 205, 215, 219, 222, 232, 237, + 238, 247, 255, 259, 265, 273, 275, 280, 298, 319, + 331, 347, 346, 363, 372, 381, 387, 389, 391, 401, + 411, 432, 441, 450, 459, 466, 465, 491, 497, 507, + 509, 511, 515, 519, 523, 527, 532, 538, 539, 545, + 559, 560, 569, 575, 576, 581, 584, 588, 593, 597, + 601, 605, 606, 610, 616, 621, 626, 636, 637, 642, + 643, 647, 657, 661, 671, 672, 682, 686, 690, 694, + 698, 708, 717, 721, 726, 733, 742, 748, 754, 762, + 766, 773, 772, 783, 784, 788, 797, 802, 810, 817, + 824, 834, 843, 850, 859, 866, 872, 879, 884, 894, + 898, 902, 908, 912, 916, 920, 924, 928, 932, 944, + 948, 952, 956, 966, 970, 977, 981, 985, 990, 995, + 1000, 1009, 1014, 1019, 1025, 1031, 1042, 1046, 1050, 1062, + 1075, 1083, 1095, 1096, 1097, 1098, 1099, 1104, 1108, 1110, + 1114, 1119, 1121, 1126, 1128, 1130, 1132, 1134, 1136, 1138, + 1147, 1158, 1160, 1162, 1167, 1180, 1185, 1190, 1194, 1198, + 1202, 1206, 1210, 1214, 1218, 1220, 1223, 1227, 1233, 1236, + 1245, 1251, 1256, 1257, 1258, 1264, 1268, 1276, 1283, 1288, + 1293, 1295, 1297, 1302, 1304, 1309, 1310, 1316, 1320, 1326, + 1332, 1338, 1344, 1350, 1357, 1359, 1361, 1364 }; #endif @@ -223,16 +220,15 @@ static const char *const yytname[] = "':'", "DORDOR", "OROR", "ANDAND", "BITOROP", "BITANDOP", "SHIFTOP", "MATCHOP", "'!'", "'~'", "REFGEN", "UMINUS", "POWOP", "POSTDEC", "POSTINC", "PREDEC", "PREINC", "ARROW", "')'", "'('", "PEG", "$accept", - "grammar", "@1", "@2", "@3", "@4", "@5", "@6", "block", "remember", + "grammar", "$@1", "$@2", "$@3", "$@4", "$@5", "$@6", "block", "remember", "mydefsv", "mblock", "mremember", "stmtseq", "fullstmt", "labfullstmt", - "barestmt", "@7", "@8", "sideff", "else", "cont", "mintro", "nexpr", + "barestmt", "$@7", "$@8", "sideff", "else", "cont", "mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "miexpr", "formname", "startsub", "startanonsub", "startformsub", "subname", "proto", "subattrlist", "myattrlist", "subbody", "expr", "listexpr", "listop", "@9", "method", "subscripted", "termbinop", "termunop", "anonymous", "termdo", "term", - "myattrterm", "myterm", "optlistexpr", "optexpr", "lpar_or_qw", "@10", - "my_scalar", "amper", "scalar", "ary", "hsh", "arylen", "star", - "indirob", 0 + "myattrterm", "myterm", "optlistexpr", "optexpr", "my_scalar", "amper", + "scalar", "ary", "hsh", "arylen", "star", "indirob", 0 }; #endif @@ -277,9 +273,8 @@ static const yytype_uint8 yyr1[] = 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, 149, 149, 150, 150, - 150, 150, 150, 151, 151, 152, 152, 153, 154, 153, - 155, 156, 157, 158, 159, 160, 161, 162, 162, 162, - 162 + 150, 150, 150, 151, 151, 152, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 160, 160, 160 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -305,9 +300,8 @@ static const yytype_uint8 yyr2[] = 5, 1, 1, 3, 4, 3, 1, 2, 2, 1, 2, 2, 1, 2, 1, 2, 1, 3, 1, 3, 4, 4, 1, 1, 1, 1, 3, 2, 3, 2, - 1, 1, 1, 0, 1, 0, 1, 1, 0, 3, - 1, 2, 2, 2, 2, 2, 2, 1, 1, 1, - 1 + 1, 1, 1, 0, 1, 0, 1, 1, 2, 2, + 2, 2, 2, 2, 1, 1, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -325,117 +319,117 @@ static const yytype_uint8 yydefact[] = 165, 167, 164, 15, 7, 49, 48, 25, 75, 73, 0, 73, 0, 0, 0, 0, 0, 0, 0, 0, 73, 26, 60, 9, 0, 50, 0, 11, 22, 21, - 0, 0, 142, 0, 133, 134, 217, 220, 219, 218, - 212, 213, 214, 216, 211, 203, 0, 0, 0, 185, - 0, 77, 177, 0, 0, 205, 180, 181, 217, 204, - 99, 218, 0, 215, 192, 147, 146, 163, 0, 0, + 0, 0, 142, 0, 133, 134, 214, 217, 216, 215, + 209, 210, 211, 213, 208, 203, 0, 0, 0, 185, + 0, 77, 177, 0, 0, 205, 180, 181, 214, 204, + 99, 215, 0, 212, 192, 147, 146, 163, 0, 0, 203, 159, 0, 197, 200, 202, 201, 183, 178, 135, 136, 157, 140, 139, 162, 0, 0, 0, 0, 90, - 0, 0, 208, 207, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 138, 137, 0, 0, 0, 0, 0, 0, 0, 19, - 72, 0, 0, 31, 15, 15, 15, 15, 15, 15, - 0, 15, 15, 37, 0, 0, 44, 47, 0, 0, - 0, 0, 0, 0, 24, 23, 20, 141, 97, 205, - 0, 0, 101, 78, 79, 187, 189, 0, 0, 0, - 93, 0, 0, 144, 0, 175, 199, 0, 83, 196, - 0, 160, 88, 87, 86, 91, 0, 0, 0, 115, - 0, 128, 124, 125, 121, 122, 119, 0, 131, 130, - 129, 127, 126, 123, 132, 120, 0, 0, 103, 0, - 96, 104, 173, 0, 0, 0, 0, 0, 0, 0, - 71, 0, 76, 77, 0, 0, 65, 0, 0, 0, - 0, 0, 15, 16, 0, 77, 61, 53, 54, 67, - 51, 52, 55, 56, 0, 191, 117, 203, 81, 0, - 190, 100, 0, 148, 0, 150, 0, 143, 198, 82, - 0, 0, 0, 108, 209, 114, 0, 0, 0, 112, - 0, 205, 174, 0, 106, 0, 169, 0, 14, 27, - 79, 15, 30, 0, 0, 66, 0, 0, 68, 70, - 0, 0, 210, 64, 69, 0, 0, 50, 0, 0, - 0, 79, 98, 102, 80, 145, 94, 149, 151, 118, - 0, 111, 156, 0, 107, 113, 0, 109, 170, 105, - 0, 45, 203, 62, 62, 0, 0, 0, 0, 65, - 0, 0, 0, 0, 116, 110, 95, 85, 84, 28, - 19, 0, 0, 0, 18, 57, 57, 0, 60, 0, - 0, 0, 36, 29, 0, 32, 60, 60, 19, 0, - 0, 33, 34, 0, 43, 62, 60, 35, 46, 38, - 39, 0, 58, 0, 60, 0, 42, 17, 0, 41, - 0, 0, 0, 57, 40, 59 + 0, 0, 0, 0, 0, 0, 0, 0, 138, 137, + 0, 0, 0, 0, 0, 0, 0, 19, 72, 0, + 0, 31, 15, 15, 15, 15, 15, 15, 0, 15, + 15, 37, 0, 0, 44, 47, 0, 0, 0, 0, + 0, 0, 24, 23, 20, 141, 97, 205, 0, 0, + 101, 78, 79, 187, 189, 0, 0, 0, 93, 0, + 0, 144, 0, 175, 199, 0, 83, 196, 0, 160, + 88, 87, 86, 91, 0, 0, 115, 0, 128, 124, + 125, 121, 122, 119, 0, 131, 130, 129, 127, 126, + 123, 132, 120, 0, 0, 103, 0, 96, 104, 173, + 0, 0, 0, 0, 0, 0, 0, 71, 0, 76, + 77, 0, 0, 65, 0, 0, 0, 0, 0, 15, + 16, 0, 77, 61, 53, 54, 67, 51, 52, 55, + 56, 0, 191, 117, 203, 81, 0, 190, 100, 0, + 148, 0, 150, 0, 143, 198, 82, 0, 0, 0, + 108, 114, 0, 0, 0, 112, 0, 205, 174, 0, + 106, 0, 169, 0, 14, 27, 79, 15, 30, 0, + 0, 66, 0, 0, 68, 70, 0, 0, 207, 64, + 69, 0, 0, 50, 0, 0, 0, 79, 98, 102, + 80, 145, 94, 149, 151, 118, 0, 111, 156, 0, + 107, 113, 0, 109, 170, 105, 0, 45, 203, 62, + 62, 0, 0, 0, 0, 65, 0, 0, 0, 0, + 116, 110, 95, 85, 84, 28, 19, 0, 0, 0, + 18, 57, 57, 0, 60, 0, 0, 0, 36, 29, + 0, 32, 60, 60, 19, 0, 0, 33, 34, 0, + 43, 62, 60, 35, 46, 38, 39, 0, 58, 0, + 60, 0, 42, 17, 0, 41, 0, 0, 0, 57, + 40, 59 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 7, 8, 9, 10, 11, 12, 13, 108, 15, - 359, 405, 418, 100, 216, 98, 99, 285, 400, 94, - 421, 206, 402, 354, 344, 298, 347, 356, 350, 281, - 191, 120, 190, 283, 224, 309, 239, 399, 95, 57, - 58, 307, 270, 59, 60, 61, 62, 63, 64, 65, - 143, 130, 66, 164, 248, 351, 67, 68, 69, 70, - 71, 72, 110 + 355, 401, 414, 100, 214, 98, 99, 282, 396, 94, + 417, 204, 398, 350, 340, 295, 343, 352, 346, 278, + 189, 120, 188, 280, 222, 306, 237, 395, 95, 57, + 58, 304, 267, 59, 60, 61, 62, 63, 64, 65, + 143, 130, 66, 347, 67, 68, 69, 70, 71, 72, + 110 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -374 +#define YYPACT_NINF -392 static const yytype_int16 yypact[] = { - 767, -374, -374, -374, -374, -374, -374, 43, -374, 2422, - 38, 967, 876, -374, -374, -374, 1546, 2422, 2422, 667, - 667, 667, 667, 667, -374, 667, 667, -374, -25, 85, - -374, 2422, -374, -374, -374, 2422, -374, 3, 6, 16, - 1370, 310, 667, 1458, 1632, 97, 2422, 68, 2422, 2422, - 2422, 2422, 2422, 2422, 2422, 1718, 160, 45, -374, 28, - -374, -374, -374, -374, 2509, -374, -374, -12, 42, 56, - -374, -374, 110, -374, -374, -374, -374, -374, -374, -374, - 115, -374, -12, -12, -12, -12, 9, -12, -12, 38, - -374, -374, 101, -374, 130, 1630, 876, -374, -374, -374, - 421, 512, -374, 87, 335, 335, -374, -374, -374, -374, - -374, -374, -374, -374, -374, 2422, 65, 2422, 2422, 327, - 38, 141, 2509, 71, 1806, 310, -374, 327, 1281, 45, - -374, 1206, 2422, -374, -12, -374, 327, 55, 163, 123, - 2422, 327, 1894, 111, -374, -374, -374, 327, 45, 335, - 335, 335, 224, 224, 177, 118, 2422, 2422, 2422, 2422, - 2422, 2422, -374, -374, 1982, 2422, 2422, 2422, 2422, 2422, - 2422, 2422, 2422, 2422, 2422, 2422, 2422, 2422, 2422, 2422, - -374, -374, 59, 2070, 2422, 2422, 2422, 2422, 2422, -374, - 172, 185, 192, -374, -374, -374, -374, -374, -374, -374, - -12, -374, -374, -374, 185, 38, -374, -374, 2422, 2422, - 2422, 2422, 2422, 2422, -374, -374, -374, -374, -374, 2422, - -72, 98, -374, -374, 142, -374, -374, 271, 122, 2422, - 45, 2158, 2246, -374, 211, -374, -374, 328, 206, -374, - 2422, 227, 188, 188, -374, 2509, 167, 112, 161, -374, - 407, 2587, 1531, 298, 409, 212, 2509, 2470, 1177, 1177, - 1252, 1356, 1443, 1044, 335, 335, 2422, 2422, -374, 2334, - -12, -374, -374, 420, 191, 144, 217, 152, 241, 603, - -374, 38, -374, 141, 149, 245, 2422, 2422, 2422, 2422, - 256, 1056, -374, -374, 2422, 141, -374, 160, -374, 160, - 160, 160, 160, 160, 190, -374, -374, 2422, 264, 38, - -374, -374, 425, -374, 498, -374, 511, -374, -374, -374, - 155, 2422, 283, -374, -374, -374, 2422, 279, 196, -374, - 518, 2422, -374, 284, -374, 285, -374, 286, -374, -374, - 142, -374, -374, 281, 209, 160, 210, 233, 160, -374, - 250, -12, -374, -374, -374, 251, 289, 1055, 2422, 2422, - 257, 142, -374, -374, -374, -374, -374, -374, -374, -374, - 202, -374, 2548, 351, -374, -374, 272, -374, -374, -374, - 174, -374, 2422, -374, -374, 361, 361, 2422, 361, 2422, - 274, 295, 361, 174, -374, -374, -374, -374, -374, -374, - -374, 366, 361, 361, -374, 44, 44, 299, 101, 386, - 361, 361, -374, -374, 694, -374, 101, 101, -374, 361, - -12, -374, -374, 361, -374, -374, 101, -374, -374, -374, - -374, 785, -374, 2422, 101, 1145, -374, -374, 312, -374, - 313, 361, 361, 44, -374, -374 + 672, -392, -392, -392, -392, -392, -392, 10, -392, 2506, + 15, 963, 872, -392, -392, -392, 1630, 2506, 2506, 364, + 364, 364, 364, 364, -392, 364, 364, -392, -38, 55, + -392, 2506, -392, -392, -392, 2506, -392, -16, -15, -2, + 1454, 1366, 364, 1542, 1716, 76, 2506, 36, 2506, 2506, + 2506, 2506, 2506, 2506, 2506, 1802, 95, 41, -392, -5, + -392, -392, -392, -392, 2525, -392, -392, 22, 65, 149, + -392, -392, 112, -392, -392, -392, -392, -392, -392, -392, + 110, -392, 32, 37, 44, 47, 1, 52, 105, 15, + -392, -392, 136, -392, 186, 1540, 872, -392, -392, -392, + 417, 508, -392, 7, 160, 160, -392, -392, -392, -392, + -392, -392, -392, -392, -392, 2506, 114, 2506, 2506, 302, + 15, 189, 2525, 122, 1890, 1366, -392, 302, 1277, 41, + -392, 1202, 2506, -392, 128, -392, 302, 21, 225, 92, + 2506, 302, 1978, 166, -392, -392, -392, 302, 41, 160, + 160, 160, -35, -35, 227, -33, 2506, 2506, 2506, 2506, + 2506, 2506, 2066, 2506, 2506, 2506, 2506, 2506, 2506, 2506, + 2506, 2506, 2506, 2506, 2506, 2506, 2506, 2506, -392, -392, + 16, 2154, 2506, 2506, 2506, 2506, 2506, -392, 221, 224, + 237, -392, -392, -392, -392, -392, -392, -392, 165, -392, + -392, -392, 224, 15, -392, -392, 2506, 2506, 2506, 2506, + 2506, 2506, -392, -392, -392, -392, -392, 2506, -53, 14, + -392, -392, 203, -392, -392, 175, 170, 2506, 41, 2242, + 2330, -392, 273, -392, -392, 403, 260, -392, 2506, 285, + 232, 232, -392, 2525, 197, 51, -392, 416, 2603, 1439, + 323, 251, 310, 2525, 275, 1040, 1040, 1173, 1248, 1351, + 999, 160, 160, 2506, 2506, -392, 2418, 209, -392, -392, + 421, 214, 83, 217, 89, 226, 599, -392, 15, -392, + 189, 69, 289, 2506, 2506, 2506, 2506, 300, 1052, -392, + -392, 2506, 189, -392, 95, -392, 95, 95, 95, 95, + 95, 219, -392, -392, 2506, 297, 15, -392, -392, 494, + -392, 507, -392, 514, -392, -392, -392, 142, 2506, 312, + -392, -392, 2506, 230, 158, -392, 585, 2506, -392, 314, + -392, 315, -392, 319, -392, -392, 203, -392, -392, 309, + 242, 95, 243, 252, 95, -392, 267, 250, -392, -392, + -392, 268, 349, 220, 2506, 2506, 278, 203, -392, -392, + -392, -392, -392, -392, -392, -392, 167, -392, 2564, 367, + -392, -392, 283, -392, -392, -392, 109, -392, 2506, -392, + -392, 377, 377, 2506, 377, 2506, 295, 303, 377, 109, + -392, -392, -392, -392, -392, -392, -392, 379, 377, 377, + -392, -10, -10, 307, 136, 385, 377, 377, -392, -392, + 690, -392, 136, 136, -392, 377, 299, -392, -392, 377, + -392, -392, 136, -392, -392, -392, -392, 781, -392, 2506, + 136, 1141, -392, -392, 313, -392, 316, 377, 377, -10, + -392, -392 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -374, -374, -374, -374, -374, -374, -374, -374, 2, -57, - -374, 2104, -374, -7, 369, 311, -6, -374, -374, -281, - -372, -116, -373, -374, 25, -176, -253, -20, -374, -374, - -1, 383, -374, 225, -239, -300, -374, 54, -9, -40, - -374, -374, -374, -374, -374, -374, -374, -374, 77, -374, - -374, -109, -122, -65, -374, -374, -374, 7, 417, 418, - -374, -374, 37 + -392, -392, -392, -392, -392, -392, -392, -392, 2, -56, + -392, -87, -392, -7, 399, 325, -6, -392, -392, -285, + -391, -99, -365, -392, 38, -77, -270, -4, -392, -392, + -61, 388, -392, 222, -237, -308, -392, 54, -9, -40, + -392, -392, -392, -392, -392, -392, -392, -392, 19, -392, + -392, -93, -123, -392, -392, 85, 378, 413, -392, -392, + 202 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -445,180 +439,206 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -193 static const yytype_int16 yytable[] = { - 56, 129, 183, 228, 159, 93, 218, 103, 101, 148, - 353, 403, 74, 92, 92, 162, 189, 194, 195, 196, - 197, 199, 201, 202, 19, 305, 109, 109, 109, 109, - 109, 235, 109, 109, 422, 139, 162, 160, 355, 161, - 380, 360, 126, 14, 340, 135, 155, 73, 131, 109, - 137, 184, 435, 185, 144, 162, 361, 111, 112, 113, - 114, 393, 115, 116, 184, 186, 185, 187, 266, 231, - 267, 445, 232, 117, 19, 129, 198, 220, 132, 133, - 193, 268, 162, 19, 20, 21, 163, 419, 420, 204, - 215, 203, 230, 200, 104, 105, 118, 304, 92, 217, - 129, 123, 92, 92, 124, 390, 391, 163, 119, 221, - 306, 346, 122, 349, 125, 227, 56, 127, 140, 188, - 136, 159, 222, 141, 323, 147, 163, 149, 150, 151, - 152, 153, 131, 237, 407, 292, 192, 286, 287, 288, - 289, 290, 291, 234, 293, 294, 205, 242, 243, 244, - 207, 246, 247, 163, 353, 250, 334, 269, 341, 156, - 157, 158, 229, 219, 336, 223, 142, 369, 225, 342, - 156, 157, 158, 233, 273, 274, 275, 276, 277, 278, - 438, 238, 279, 73, 156, 157, 158, 322, 240, 271, - 156, 157, 158, 280, 397, 156, 157, 158, 363, 297, - 299, 300, 301, 302, 303, 331, 282, 296, 374, 376, - 56, 333, 308, 284, 394, 241, 156, 157, 158, 311, - 312, 317, 314, 316, 156, 157, 158, 156, 157, 158, - 319, 320, 156, 157, 158, 358, 245, 335, 321, 156, - 157, 158, 251, 252, 253, 254, 255, 256, 257, 258, - 259, 260, 261, 262, 263, 264, 265, 327, 328, 324, - 330, 337, 158, 156, 157, 158, 343, 129, 156, 157, - 158, 19, 168, 401, 156, 157, 158, 345, 299, 348, - 299, 92, 357, 339, 381, 348, 387, 362, 364, 156, - 157, 158, 424, 371, 377, 378, 379, 352, 178, 373, - 429, 430, 382, 179, 180, 181, 383, 384, 182, 389, - 436, 365, 370, 156, 157, 158, -193, -193, 439, 73, - 182, 16, 56, 17, 18, 19, 20, 21, 22, 23, - 385, 128, 25, 26, 27, 28, 107, 29, 30, 31, - 32, 33, 129, 156, 157, 158, 34, 386, 388, 348, - 348, 156, 157, 158, 392, 433, 166, -193, 168, 169, - 35, 395, 36, 37, 38, 39, 40, 41, 310, 396, - 404, 410, 42, 43, 44, 45, 46, 47, 348, 48, - 345, 97, 398, 177, 178, 49, 415, 168, 169, 179, - 180, 181, 411, 414, 182, 398, 423, 50, 51, 52, - 156, 157, 158, 372, 53, 54, 425, 214, 55, 441, - 442, 431, 177, 178, 409, 440, 92, 121, 179, 180, - 181, -13, 75, 182, 348, 318, 179, 180, 181, 295, - 73, 182, 16, 92, 17, 18, 19, 20, 21, 22, - 23, 76, 24, 25, 26, 27, 28, 413, 29, 30, + 56, 129, 226, 349, 160, 93, 161, 103, 101, 148, + 14, 418, 74, 92, 92, 399, 19, 187, 351, 215, + 191, 356, 216, 159, 73, 263, 303, 264, 376, 202, + 182, 19, 183, 415, 416, 139, 104, 105, 265, 156, + 157, 158, 126, 336, 302, 135, 155, 233, 441, 389, + 119, 19, 20, 21, 122, 357, 431, -193, -193, 127, + 117, 180, 136, 320, 239, 141, 118, 147, 196, 149, + 150, 151, 152, 153, 182, 129, 183, 218, 337, 156, + 157, 158, 123, 124, 386, 387, 156, 157, 158, 338, + 213, 201, 228, 162, 301, 330, 125, 140, 92, 197, + 129, 332, 92, 92, 109, 109, 109, 109, 109, 219, + 109, 109, 232, 403, 266, 225, 56, 159, 73, 230, + 181, 186, 220, 156, 157, 158, 131, 109, 137, 393, + 192, 190, 144, 235, 142, 193, 283, 284, 285, 286, + 287, 288, 194, 290, 291, 195, 349, 240, 241, 242, + 199, 244, 245, 247, 365, 156, 157, 158, 184, 434, + 185, 156, 157, 158, 156, 157, 158, 156, 157, 158, + 370, 198, 270, 271, 272, 273, 274, 275, 243, 390, + 276, 203, 248, 249, 250, 251, 252, 253, 254, 255, + 256, 257, 258, 259, 260, 261, 262, 294, 296, 297, + 298, 299, 300, 200, 372, 293, 205, 342, 56, 345, + 131, 359, 217, 221, 156, 157, 158, 319, 309, 223, + 311, 313, 111, 112, 113, 114, 229, 115, 116, 317, + 156, 157, 158, 354, 329, 231, 236, 331, 238, 156, + 157, 158, 277, 132, 133, 279, 333, 156, 157, 158, + 369, 177, 178, 179, 323, 324, 180, 326, 281, 206, + 207, 208, 209, 289, 129, 268, 210, 308, 211, 156, + 157, 158, 307, 305, 341, 296, 344, 296, 92, 353, + 335, 377, 344, 314, 316, 397, 156, 157, 158, 156, + 157, 158, 156, 157, 158, 402, 318, 404, 156, 157, + 158, 408, 156, 157, 158, 420, 158, 327, 361, 366, + 339, 412, 413, 425, 426, 19, 358, -68, 56, 422, + 423, 360, 367, 432, 373, 374, 163, 227, 428, 375, + 378, 435, 430, 164, 165, 166, 167, 176, 129, 379, + 380, 368, 177, 178, 179, 344, 344, 180, 383, 381, + 439, 440, 168, 169, 322, 170, 171, 172, 173, 174, + 175, 176, 166, 167, 382, 384, 177, 178, 179, 385, + 166, 180, 348, 73, 344, 388, 341, 391, 394, 19, + 392, 164, -193, 166, 167, 106, 400, 175, 176, 410, + 107, 394, 406, 177, 178, 179, 176, 429, 180, 411, + 407, 177, 178, 179, 419, 421, 180, 427, 175, 176, + 437, 97, 92, 438, 177, 178, 179, -13, 75, 180, + 344, 212, 121, 405, 292, 145, 73, 436, 16, 92, + 17, 18, 19, 20, 21, 22, 23, 76, 24, 25, + 26, 27, 28, 409, 29, 30, 31, 32, 33, 77, + 96, 78, 79, 34, 80, 81, 82, 83, 84, 85, + 146, 0, 0, 86, 87, 88, 89, 35, 0, 36, + 37, 38, 39, 40, 41, 156, 157, 158, 0, 42, + 43, 44, 45, 46, 47, 90, 48, 0, 156, 157, + 158, 0, 49, 156, 157, 158, 0, 0, 0, 0, + 315, 0, 0, 0, 50, 51, 52, 0, -3, 75, + 0, 53, 54, 321, 0, 55, 91, 73, 328, 16, + 0, 17, 18, 19, 20, 21, 22, 23, 76, 24, + 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, + 77, 96, 78, 79, 34, 80, 81, 82, 83, 84, + 85, 0, 0, 0, 86, 87, 88, 89, 35, 0, + 36, 37, 38, 39, 40, 41, 156, 157, 158, 0, + 42, 43, 44, 45, 46, 47, 90, 48, 0, 156, + 157, 158, 0, 49, 0, 0, 156, 157, 158, 0, + 0, 362, 0, 0, 0, 50, 51, 52, 0, 0, + 75, 0, 53, 54, 363, 0, 55, 91, 73, 334, + 16, 364, 17, 18, 19, 20, 21, 22, 23, 76, + 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, + 33, 77, 96, 78, 79, 34, 80, 81, 82, 83, + 84, 85, 0, 0, 0, 86, 87, 88, 89, 35, + 0, 36, 37, 38, 39, 40, 41, 156, 157, 158, + 0, 42, 43, 44, 45, 46, 47, 90, 48, 0, + 0, 0, 0, 0, 49, 1, 2, 3, 4, 5, + 6, 0, 371, 0, 0, 0, 50, 51, 52, 0, + 0, 75, 0, 53, 54, 0, 0, 55, 91, 73, + 424, 16, 0, 17, 18, 19, 20, 21, 22, 23, + 76, 24, 25, 26, 27, 28, 0, 29, 30, 31, + 32, 33, 77, 96, 78, 79, 34, 80, 81, 82, + 83, 84, 85, 0, 0, 0, 86, 87, 88, 89, + 35, 0, 36, 37, 38, 39, 40, 41, 0, 0, + 0, 0, 42, 43, 44, 45, 46, 47, 90, 48, + 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, + 0, 0, 75, 0, 53, 54, 0, 0, 55, 91, + 73, 433, 16, 0, 17, 18, 19, 20, 21, 22, + 23, 76, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 77, 96, 78, 79, 34, 80, 81, - 82, 83, 84, 85, 145, 146, 0, 86, 87, 88, - 89, 35, 0, 36, 37, 38, 39, 40, 41, 156, - 157, 158, 0, 42, 43, 44, 45, 46, 47, 90, - 48, 0, 156, 157, 158, 178, 49, 156, 157, 158, - 179, 180, 181, 0, 325, 182, 0, 0, 50, 51, - 52, 0, -3, 75, 0, 53, 54, 332, 0, 55, - 91, 73, 366, 16, 0, 17, 18, 19, 20, 21, + 82, 83, 84, 85, 0, 0, 0, 86, 87, 88, + 89, 35, 0, 36, 37, 38, 39, 40, 41, 0, + 0, 0, 0, 42, 43, 44, 45, 46, 47, 90, + 48, 0, 0, 0, 0, 0, 49, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, + 52, 0, 0, 75, 0, 53, 54, 0, 0, 55, + 91, 73, 0, 16, 0, 17, 18, 19, 20, 21, 22, 23, 76, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 77, 96, 78, 79, 34, 80, 81, 82, 83, 84, 85, 0, 0, 0, 86, 87, 88, 89, 35, 0, 36, 37, 38, 39, 40, 41, - 156, 157, 158, 0, 42, 43, 44, 45, 46, 47, - 90, 48, 0, 156, 157, 158, 0, 49, 0, 0, - 156, 157, 158, 0, 0, 367, 0, 0, 0, 50, - 51, 52, 0, 0, 75, 0, 53, 54, 368, 0, - 55, 91, 73, 338, 16, 375, 17, 18, 19, 20, + 0, 0, 0, 0, 42, 43, 44, 45, 46, 47, + 90, 48, 0, 0, 0, 0, 0, 49, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, + 51, 52, 0, 0, 75, 0, 53, 54, 0, 0, + 55, 91, 73, 0, 16, 0, 17, 18, 19, 20, 21, 22, 23, 76, 24, 25, 26, 27, 28, 0, - 29, 30, 31, 32, 33, 77, 96, 78, 79, 34, + 29, 30, 31, 32, 33, 77, 0, 78, 79, 34, 80, 81, 82, 83, 84, 85, 0, 0, 0, 86, 87, 88, 89, 35, 0, 36, 37, 38, 39, 40, 41, 0, 0, 0, 0, 42, 43, 44, 45, 46, - 47, 90, 48, 0, 0, 0, 73, 0, 49, 0, - 0, 0, 19, 0, 0, 0, 0, 0, 106, 0, - 50, 51, 52, 107, 0, 75, 0, 53, 54, 0, - 0, 55, 91, 73, 428, 16, 0, 17, 18, 19, - 20, 21, 22, 23, 76, 24, 25, 26, 27, 28, - 0, 29, 30, 31, 32, 33, 77, 96, 78, 79, - 34, 80, 81, 82, 83, 84, 85, 0, 0, 0, - 86, 87, 88, 89, 35, 0, 36, 37, 38, 39, - 40, 41, 0, 0, 0, 0, 42, 43, 44, 45, - 46, 47, 90, 48, 0, 0, 0, 0, 0, 49, - 1, 2, 3, 4, 5, 6, 0, 0, 0, 0, - 0, 50, 51, 52, 0, 0, 75, 0, 53, 54, - 0, 0, 55, 91, 73, 437, 16, 0, 17, 18, - 19, 20, 21, 22, 23, 76, 24, 25, 26, 27, - 28, 0, 29, 30, 31, 32, 33, 77, 96, 78, - 79, 34, 80, 81, 82, 83, 84, 85, 0, 0, - 0, 86, 87, 88, 89, 35, 0, 36, 37, 38, - 39, 40, 41, 0, 0, 0, 0, 42, 43, 44, - 45, 46, 47, 90, 48, 0, 0, 0, 0, 0, - 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 50, 51, 52, 0, 0, 75, 0, 53, - 54, 0, 0, 55, 91, 73, 0, 16, 0, 17, - 18, 19, 20, 21, 22, 23, 76, 24, 25, 26, - 27, 28, 0, 29, 30, 31, 32, 33, 77, 96, - 78, 79, 34, 80, 81, 82, 83, 84, 85, 0, - 0, 0, 86, 87, 88, 89, 35, 0, 36, 37, - 38, 39, 40, 41, 0, 0, 0, 0, 42, 43, - 44, 45, 46, 47, 90, 48, 0, 0, 0, 0, - 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 50, 51, 52, 0, 0, 75, 0, - 53, 54, 0, 0, 55, 91, 73, 0, 16, 0, - 17, 18, 19, 20, 21, 22, 23, 76, 24, 25, - 26, 27, 28, 0, 29, 30, 31, 32, 33, 77, - 0, 78, 79, 34, 80, 81, 82, 83, 84, 85, - 0, 0, 0, 86, 87, 88, 89, 35, 0, 36, - 37, 38, 39, 40, 41, 0, 0, 0, 0, 42, - 43, 44, 45, 46, 47, 90, 48, 0, 0, 0, - 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 50, 51, 52, 75, 0, 0, - 0, 53, 54, 0, 0, 55, 91, 16, 0, 17, - 18, 19, 20, 21, 22, 23, -63, 24, 25, 26, - 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, - 0, 0, 34, 0, 208, 209, 210, 211, 0, 0, - 0, 212, 0, 213, 168, 169, 35, 0, 36, 37, + 47, 90, 48, 0, 0, 0, 0, 0, 49, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 50, 51, 52, 75, 0, 0, 0, 53, 54, 166, + 167, 55, 91, 16, 0, 17, 18, 19, 20, 21, + 22, 23, -63, 24, 25, 26, 27, 28, 0, 29, + 30, 31, 32, 33, 0, 176, 0, 0, 34, 0, + 177, 178, 179, 0, 0, 180, 0, 0, 164, 165, + 166, 167, 35, 0, 36, 37, 38, 39, 40, 41, + 0, 0, 0, 0, 42, 43, 44, 45, 46, 47, + 0, 48, 172, 173, 174, 175, 176, 49, 0, 0, + 0, 177, 178, 179, 0, 0, 180, 0, 0, 50, + 51, 52, 75, 0, 0, 0, 53, 54, 0, 0, + 55, 0, 16, 0, 17, 18, 19, 20, 21, 22, + 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, + 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 35, 0, 36, 37, 38, 39, 40, 41, 0, + 0, 0, -163, 42, 43, 44, 45, 46, 47, 0, + 48, 182, 0, 183, -163, 0, 49, 0, 0, 0, + 0, 0, -163, 0, 0, 0, 0, 0, 50, 51, + 52, 164, 165, 166, 167, 53, 54, 0, -63, 55, + 0, -163, -163, -163, -163, 0, 0, 0, -163, 0, + -163, 0, 0, -163, 0, 0, 173, 174, 175, 176, + -163, -163, -163, -163, 177, 178, 179, 0, 0, 180, + 0, 0, 0, 0, -163, -163, -163, -192, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -192, + 0, 0, 0, -163, -163, -163, 0, -192, -163, -163, + 0, 0, 0, 0, 0, 0, 164, 165, 166, 167, + 0, 0, 0, 0, 0, 0, -192, -192, -192, -192, + 0, 0, 0, -192, 0, -192, 0, 0, -192, 0, + 0, 0, 174, 175, 176, -192, -192, -192, -192, 177, + 178, 179, 0, 0, 180, 0, 0, 0, 0, -192, + -192, -192, 0, -192, -192, -192, -192, -192, -192, -192, + -192, -192, -192, -192, 0, 0, 0, 0, -192, -192, + -192, 0, 0, -192, -192, 73, 0, 16, 0, 17, + 18, 19, 20, 21, 22, 23, 0, 128, 25, 26, + 27, 28, 107, 29, 30, 31, 32, 33, 0, 0, + 0, 0, 34, 0, 0, 0, 0, 0, 0, 164, + 165, 166, 167, 0, 0, 0, 35, 0, 36, 37, 38, 39, 40, 41, 0, 0, 0, 0, 42, 43, - 44, 45, 46, 47, 0, 48, 0, 156, 157, 158, - 178, 49, 0, 0, 0, 179, 180, 181, 0, 0, - 182, 0, 0, 50, 51, 52, 75, 0, 0, 0, - 53, 54, -68, 0, 55, 0, 16, 0, 17, 18, - 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, - 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, - 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 35, 0, 36, 37, 38, - 39, 40, 41, 0, 0, 0, -163, 42, 43, 44, - 45, 46, 47, 0, 48, 184, 0, 185, -163, 0, - 49, 0, 0, 0, 0, 0, -163, 0, 0, 0, - 0, 0, 50, 51, 52, 166, 167, 168, 169, 53, - 54, 0, -63, 55, 0, -163, -163, -163, -163, 0, - 0, 0, -163, 0, -163, 0, 0, -163, 0, 174, - 175, 176, 177, 178, -163, -163, -163, -163, 179, 180, - 181, 0, 0, 182, 0, 0, 0, 0, -163, -163, - -163, -192, -163, -163, -163, -163, -163, -163, -163, -163, - -163, -163, -163, -192, 0, 0, 0, -163, -163, -163, - 0, -192, -163, -163, 0, 0, 0, 0, 0, 0, - 166, 167, 168, 169, 0, 0, 0, 0, 0, 0, - -192, -192, -192, -192, 0, 0, 0, -192, 0, -192, - 0, 0, -192, 0, 0, 175, 176, 177, 178, -192, - -192, -192, -192, 179, 180, 181, 0, 0, 182, 0, - 0, 0, 0, -192, -192, -192, 0, -192, -192, -192, - -192, -192, -192, -192, -192, -192, -192, -192, 0, 0, - 0, 0, -192, -192, -192, 0, 0, -192, -192, 73, - 0, 16, 0, 17, 18, 19, 20, 21, 22, 23, + 44, 45, 46, 47, 0, 48, 175, 176, 0, 0, + 0, 49, 177, 178, 179, 0, 0, 180, 0, 0, + 0, 0, 0, 50, 51, 52, 0, 0, 0, 0, + 53, 54, 0, 73, 55, 16, 0, 17, 18, 19, + 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, + 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, + 34, 0, 0, 0, 0, 0, 0, -193, 0, 166, + 167, 0, 0, 0, 35, 0, 36, 37, 38, 39, + 40, 41, 0, 0, 0, 0, 42, 43, 44, 45, + 46, 47, 0, 48, 175, 176, 0, 0, 0, 49, + 177, 178, 179, 0, 0, 180, 0, 0, 0, 0, + 0, 50, 51, 52, 0, 0, 0, 0, 53, 54, + 0, 73, 55, 16, 0, 17, 18, 19, 20, 21, + 22, 23, 0, 134, 25, 26, 27, 28, 0, 29, + 30, 31, 32, 33, 0, 0, 0, 0, 34, 206, + 207, 208, 209, 0, 0, 0, 210, 0, 211, 0, + 0, 0, 35, 0, 36, 37, 38, 39, 40, 41, + 0, 0, 0, 0, 42, 43, 44, 45, 46, 47, + 0, 48, 156, 157, 158, 0, 0, 49, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, + 51, 52, 0, 0, 0, 0, 53, 54, 0, 0, + 55, 16, 102, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, - 0, 0, 0, 0, 166, 167, 168, 169, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 36, 37, 38, 39, 40, 41, 0, 0, 0, 0, 42, 43, 44, 45, 46, 47, 0, 48, - 176, 177, 178, 0, 0, 49, 0, 179, 180, 181, - 0, 0, 182, 0, 0, 0, 0, 50, 51, 52, - 0, 0, 0, 0, 53, 54, 0, 73, 55, 16, - 0, 17, 18, 19, 20, 21, 22, 23, 0, 134, - 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, - 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, - 0, 166, 167, 168, 169, 0, 0, 0, 35, 0, - 36, 37, 38, 39, 40, 41, 0, 0, 0, 0, - 42, 43, 44, 45, 46, 47, 0, 48, 177, 178, - 0, 0, 0, 49, 179, 180, 181, 0, 0, 182, - 0, 0, 0, 0, 0, 50, 51, 52, 0, 0, - 0, 0, 53, 54, 0, 0, 55, 16, 102, 17, - 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, + 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, + 0, 0, 0, 0, 53, 54, 0, 16, 55, 17, + 18, 19, 20, 21, 22, 23, 138, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, - 0, 0, 34, 0, 0, 0, 0, 0, 0, -193, - 0, 168, 169, 0, 0, 0, 35, 0, 36, 37, + 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 35, 0, 36, 37, 38, 39, 40, 41, 0, 0, 0, 0, 42, 43, - 44, 45, 46, 47, 0, 48, 177, 178, 0, 0, - 0, 49, 179, 180, 181, 0, 0, 182, 0, 0, + 44, 45, 46, 47, 0, 48, 0, 0, 0, 0, + 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, 0, 0, 0, 0, 53, 54, 0, 16, 55, 17, 18, 19, 20, 21, - 22, 23, 138, 24, 25, 26, 27, 28, 0, 29, - 30, 31, 32, 33, 0, 0, 0, 0, 34, 208, - 209, 210, 211, 0, 0, 0, 212, 0, 213, 0, + 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, + 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 36, 37, 38, 39, 40, 41, 0, 0, 0, 0, 42, 43, 44, 45, 46, 47, - 0, 48, 156, 157, 158, 0, 0, 49, 0, 0, + 0, 48, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, - 51, 52, 0, 0, 0, 0, 53, 54, 0, 16, - 55, 17, 18, 19, 20, 21, 22, 23, 0, 24, + 51, 52, 0, 0, 0, 0, 53, 54, 0, 154, + 55, 16, 0, 17, 18, 19, 20, 21, 22, 23, + 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, + 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 35, 0, 36, 37, 38, 39, 40, 41, 0, 0, + 0, 0, 42, 43, 44, 45, 46, 47, 0, 48, + 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, + 0, 0, 0, 0, 53, 54, 0, 224, 55, 16, + 0, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, @@ -626,7 +646,7 @@ static const yytype_int16 yytable[] = 42, 43, 44, 45, 46, 47, 0, 48, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, 0, 0, - 0, 0, 53, 54, 0, 154, 55, 16, 0, 17, + 0, 0, 53, 54, 0, 234, 55, 16, 0, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, @@ -635,7 +655,7 @@ static const yytype_int16 yytable[] = 44, 45, 46, 47, 0, 48, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, 0, 0, 0, 0, - 53, 54, 0, 226, 55, 16, 0, 17, 18, 19, + 53, 54, 0, 246, 55, 16, 0, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -644,7 +664,7 @@ static const yytype_int16 yytable[] = 46, 47, 0, 48, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, 0, 0, 0, 0, 53, 54, - 0, 236, 55, 16, 0, 17, 18, 19, 20, 21, + 0, 269, 55, 16, 0, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -652,7 +672,7 @@ static const yytype_int16 yytable[] = 0, 0, 0, 0, 42, 43, 44, 45, 46, 47, 0, 48, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, - 51, 52, 0, 0, 0, 0, 53, 54, 0, 249, + 51, 52, 0, 0, 0, 0, 53, 54, 0, 310, 55, 16, 0, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, @@ -661,7 +681,7 @@ static const yytype_int16 yytable[] = 0, 0, 42, 43, 44, 45, 46, 47, 0, 48, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, - 0, 0, 0, 0, 53, 54, 0, 272, 55, 16, + 0, 0, 0, 0, 53, 54, 0, 312, 55, 16, 0, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, @@ -670,228 +690,229 @@ static const yytype_int16 yytable[] = 42, 43, 44, 45, 46, 47, 0, 48, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 51, 52, 0, 0, - 0, 0, 53, 54, 0, 313, 55, 16, 0, 17, + 0, 0, 53, 54, 0, 325, 55, 16, 0, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 0, 36, 37, 38, 39, 40, 41, 0, 0, 0, 0, 42, 43, - 44, 45, 46, 47, 0, 48, 0, 0, 0, 0, - 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, + 44, 45, 46, 47, 0, 48, 163, 0, 0, 0, + 0, 49, 0, 164, 165, 166, 167, 0, 0, 0, 0, 0, 0, 50, 51, 52, 0, 0, 0, 0, - 53, 54, 0, 315, 55, 16, 0, 17, 18, 19, - 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, - 0, 29, 30, 31, 32, 33, 0, 0, 0, 0, - 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 35, 0, 36, 37, 38, 39, - 40, 41, 0, 0, 0, 0, 42, 43, 44, 45, - 46, 47, 0, 48, 0, 0, 0, 0, 0, 49, + 53, 54, 168, 169, 55, 170, 171, 172, 173, 174, + 175, 176, 0, 0, 0, 163, 177, 178, 179, 0, + 0, 180, 164, 165, 166, 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 50, 51, 52, 0, 0, 0, 0, 53, 54, - 0, 329, 55, 16, 0, 17, 18, 19, 20, 21, - 22, 23, 0, 24, 25, 26, 27, 28, 0, 29, - 30, 31, 32, 33, 0, 0, 0, 0, 34, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 35, 0, 36, 37, 38, 39, 40, 41, - 0, 0, 0, 0, 42, 43, 44, 45, 46, 47, - 406, 48, 408, 0, 0, 0, 412, 49, 0, 0, - 0, 0, 0, 0, 0, 0, 416, 417, 0, 50, - 51, 52, 0, 0, 426, 427, 53, 54, 0, 0, - 55, 165, 0, 432, 0, 0, 0, 434, 166, 167, - 168, 169, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 443, 444, 170, 171, 326, - 172, 173, 174, 175, 176, 177, 178, 0, 0, 0, - 165, 179, 180, 181, 0, 0, 182, 166, 167, 168, - 169, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 170, 171, 0, 172, - 173, 174, 175, 176, 177, 178, 0, 0, 0, 165, - 179, 180, 181, 0, 0, 182, 166, 167, 168, 169, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 171, 0, 172, 173, - 174, 175, 176, 177, 178, 0, 0, 0, -193, 179, - 180, 181, 0, 0, 182, 166, 167, 168, 169, 0, + 0, 0, 169, 0, 170, 171, 172, 173, 174, 175, + 176, 0, 0, 0, -193, 177, 178, 179, 0, 0, + 180, 164, 165, 166, 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 172, 173, 174, - 175, 176, 177, 178, 0, 0, 0, 0, 179, 180, - 181, 0, 0, 182 + 0, 0, 0, 170, 171, 172, 173, 174, 175, 176, + 0, 0, 0, 0, 177, 178, 179, 0, 0, 180 }; static const yytype_int16 yycheck[] = { - 9, 41, 67, 125, 76, 11, 115, 16, 15, 49, - 291, 384, 10, 11, 12, 27, 73, 82, 83, 84, - 85, 86, 87, 88, 15, 97, 19, 20, 21, 22, - 23, 140, 25, 26, 406, 44, 27, 9, 291, 11, - 340, 294, 40, 0, 283, 43, 55, 9, 41, 42, - 43, 9, 425, 11, 47, 27, 295, 20, 21, 22, - 23, 361, 25, 26, 9, 9, 11, 11, 9, 134, - 11, 443, 137, 98, 15, 115, 67, 117, 41, 42, - 81, 22, 27, 15, 16, 17, 98, 43, 44, 90, - 96, 89, 132, 86, 17, 18, 11, 219, 96, 12, - 140, 98, 100, 101, 98, 358, 359, 98, 31, 118, - 12, 287, 35, 289, 98, 124, 125, 40, 21, 9, - 43, 76, 120, 46, 12, 48, 98, 50, 51, 52, - 53, 54, 125, 142, 387, 200, 21, 194, 195, 196, - 197, 198, 199, 20, 201, 202, 45, 156, 157, 158, - 20, 160, 161, 98, 435, 164, 12, 98, 9, 72, - 73, 74, 125, 98, 12, 24, 98, 12, 97, 20, - 72, 73, 74, 10, 183, 184, 185, 186, 187, 188, - 433, 70, 189, 9, 72, 73, 74, 20, 11, 182, - 72, 73, 74, 21, 20, 72, 73, 74, 307, 208, - 209, 210, 211, 212, 213, 270, 21, 205, 12, 331, - 219, 20, 70, 21, 12, 97, 72, 73, 74, 97, - 229, 10, 231, 232, 72, 73, 74, 72, 73, 74, - 24, 240, 72, 73, 74, 292, 159, 20, 11, 72, - 73, 74, 165, 166, 167, 168, 169, 170, 171, 172, - 173, 174, 175, 176, 177, 178, 179, 266, 267, 98, - 269, 20, 74, 72, 73, 74, 21, 307, 72, 73, - 74, 15, 60, 382, 72, 73, 74, 286, 287, 288, - 289, 279, 291, 281, 341, 294, 351, 97, 24, 72, - 73, 74, 408, 10, 10, 10, 10, 290, 86, 20, - 416, 417, 21, 91, 92, 93, 97, 97, 96, 20, - 426, 309, 321, 72, 73, 74, 92, 93, 434, 9, - 96, 11, 331, 13, 14, 15, 16, 17, 18, 19, - 97, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 382, 72, 73, 74, 36, 97, 97, 358, - 359, 72, 73, 74, 97, 420, 58, 59, 60, 61, - 50, 10, 52, 53, 54, 55, 56, 57, 97, 97, - 9, 97, 62, 63, 64, 65, 66, 67, 387, 69, - 389, 12, 380, 85, 86, 75, 20, 60, 61, 91, - 92, 93, 97, 400, 96, 393, 97, 87, 88, 89, - 72, 73, 74, 326, 94, 95, 20, 96, 98, 97, - 97, 418, 85, 86, 389, 435, 414, 34, 91, 92, - 93, 0, 1, 96, 433, 97, 91, 92, 93, 204, - 9, 96, 11, 431, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 393, 27, 28, + 9, 41, 125, 288, 9, 11, 11, 16, 15, 49, + 0, 402, 10, 11, 12, 380, 15, 73, 288, 12, + 81, 291, 115, 76, 9, 9, 12, 11, 336, 90, + 9, 15, 11, 43, 44, 44, 17, 18, 22, 72, + 73, 74, 40, 280, 97, 43, 55, 140, 439, 357, + 31, 15, 16, 17, 35, 292, 421, 92, 93, 40, + 98, 96, 43, 12, 97, 46, 11, 48, 67, 50, + 51, 52, 53, 54, 9, 115, 11, 117, 9, 72, + 73, 74, 98, 98, 354, 355, 72, 73, 74, 20, + 96, 89, 132, 98, 217, 12, 98, 21, 96, 98, + 140, 12, 100, 101, 19, 20, 21, 22, 23, 118, + 25, 26, 20, 383, 98, 124, 125, 76, 9, 98, + 98, 9, 120, 72, 73, 74, 41, 42, 43, 20, + 98, 21, 47, 142, 98, 98, 192, 193, 194, 195, + 196, 197, 98, 199, 200, 98, 431, 156, 157, 158, + 98, 160, 161, 162, 12, 72, 73, 74, 9, 429, + 11, 72, 73, 74, 72, 73, 74, 72, 73, 74, + 12, 86, 181, 182, 183, 184, 185, 186, 159, 12, + 187, 45, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 173, 174, 175, 176, 177, 206, 207, 208, + 209, 210, 211, 98, 327, 203, 20, 284, 217, 286, + 125, 304, 98, 24, 72, 73, 74, 20, 227, 97, + 229, 230, 20, 21, 22, 23, 98, 25, 26, 238, + 72, 73, 74, 289, 20, 10, 70, 20, 11, 72, + 73, 74, 21, 41, 42, 21, 20, 72, 73, 74, + 20, 91, 92, 93, 263, 264, 96, 266, 21, 39, + 40, 41, 42, 98, 304, 180, 46, 97, 48, 72, + 73, 74, 97, 70, 283, 284, 285, 286, 276, 288, + 278, 337, 291, 10, 24, 378, 72, 73, 74, 72, + 73, 74, 72, 73, 74, 382, 11, 384, 72, 73, + 74, 388, 72, 73, 74, 404, 74, 98, 306, 318, + 21, 398, 399, 412, 413, 15, 97, 97, 327, 406, + 407, 24, 10, 422, 10, 10, 51, 125, 415, 10, + 21, 430, 419, 58, 59, 60, 61, 86, 378, 97, + 97, 322, 91, 92, 93, 354, 355, 96, 98, 97, + 437, 438, 77, 78, 79, 80, 81, 82, 83, 84, + 85, 86, 60, 61, 97, 97, 91, 92, 93, 20, + 60, 96, 287, 9, 383, 97, 385, 10, 376, 15, + 97, 58, 59, 60, 61, 21, 9, 85, 86, 396, + 26, 389, 97, 91, 92, 93, 86, 98, 96, 20, + 97, 91, 92, 93, 97, 20, 96, 414, 85, 86, + 97, 12, 410, 97, 91, 92, 93, 0, 1, 96, + 429, 96, 34, 385, 202, 47, 9, 431, 11, 427, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 389, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, + 47, -1, -1, 46, 47, 48, 49, 50, -1, 52, + 53, 54, 55, 56, 57, 72, 73, 74, -1, 62, + 63, 64, 65, 66, 67, 68, 69, -1, 72, 73, + 74, -1, 75, 72, 73, 74, -1, -1, -1, -1, + 97, -1, -1, -1, 87, 88, 89, -1, 0, 1, + -1, 94, 95, 97, -1, 98, 99, 9, 97, 11, + -1, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, -1, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, -1, -1, -1, 46, 47, 48, 49, 50, -1, + 52, 53, 54, 55, 56, 57, 72, 73, 74, -1, + 62, 63, 64, 65, 66, 67, 68, 69, -1, 72, + 73, 74, -1, 75, -1, -1, 72, 73, 74, -1, + -1, 97, -1, -1, -1, 87, 88, 89, -1, -1, + 1, -1, 94, 95, 97, -1, 98, 99, 9, 10, + 11, 97, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, -1, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, -1, -1, -1, 46, 47, 48, 49, 50, + -1, 52, 53, 54, 55, 56, 57, 72, 73, 74, + -1, 62, 63, 64, 65, 66, 67, 68, 69, -1, + -1, -1, -1, -1, 75, 3, 4, 5, 6, 7, + 8, -1, 97, -1, -1, -1, 87, 88, 89, -1, + -1, 1, -1, 94, 95, -1, -1, 98, 99, 9, + 10, 11, -1, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, -1, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, -1, -1, -1, 46, 47, 48, 49, + 50, -1, 52, 53, 54, 55, 56, 57, -1, -1, + -1, -1, 62, 63, 64, 65, 66, 67, 68, 69, + -1, -1, -1, -1, -1, 75, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 87, 88, 89, + -1, -1, 1, -1, 94, 95, -1, -1, 98, 99, + 9, 10, 11, -1, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, -1, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 47, 47, -1, 46, 47, 48, - 49, 50, -1, 52, 53, 54, 55, 56, 57, 72, - 73, 74, -1, 62, 63, 64, 65, 66, 67, 68, - 69, -1, 72, 73, 74, 86, 75, 72, 73, 74, - 91, 92, 93, -1, 97, 96, -1, -1, 87, 88, - 89, -1, 0, 1, -1, 94, 95, 97, -1, 98, - 99, 9, 97, 11, -1, 13, 14, 15, 16, 17, + 39, 40, 41, 42, -1, -1, -1, 46, 47, 48, + 49, 50, -1, 52, 53, 54, 55, 56, 57, -1, + -1, -1, -1, 62, 63, 64, 65, 66, 67, 68, + 69, -1, -1, -1, -1, -1, 75, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 87, 88, + 89, -1, -1, 1, -1, 94, 95, -1, -1, 98, + 99, 9, -1, 11, -1, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, -1, -1, -1, 46, 47, 48, 49, 50, -1, 52, 53, 54, 55, 56, 57, - 72, 73, 74, -1, 62, 63, 64, 65, 66, 67, - 68, 69, -1, 72, 73, 74, -1, 75, -1, -1, - 72, 73, 74, -1, -1, 97, -1, -1, -1, 87, - 88, 89, -1, -1, 1, -1, 94, 95, 97, -1, - 98, 99, 9, 10, 11, 97, 13, 14, 15, 16, + -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, + 68, 69, -1, -1, -1, -1, -1, 75, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, + 88, 89, -1, -1, 1, -1, 94, 95, -1, -1, + 98, 99, 9, -1, 11, -1, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 27, 28, 29, 30, 31, 32, -1, 34, 35, 36, 37, 38, 39, 40, 41, 42, -1, -1, -1, 46, 47, 48, 49, 50, -1, 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, - 67, 68, 69, -1, -1, -1, 9, -1, 75, -1, - -1, -1, 15, -1, -1, -1, -1, -1, 21, -1, - 87, 88, 89, 26, -1, 1, -1, 94, 95, -1, - -1, 98, 99, 9, 10, 11, -1, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - -1, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, -1, -1, -1, - 46, 47, 48, 49, 50, -1, 52, 53, 54, 55, - 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, - 66, 67, 68, 69, -1, -1, -1, -1, -1, 75, - 3, 4, 5, 6, 7, 8, -1, -1, -1, -1, - -1, 87, 88, 89, -1, -1, 1, -1, 94, 95, - -1, -1, 98, 99, 9, 10, 11, -1, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, -1, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, -1, -1, - -1, 46, 47, 48, 49, 50, -1, 52, 53, 54, - 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, - 65, 66, 67, 68, 69, -1, -1, -1, -1, -1, - 75, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 87, 88, 89, -1, -1, 1, -1, 94, - 95, -1, -1, 98, 99, 9, -1, 11, -1, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, -1, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, -1, - -1, -1, 46, 47, 48, 49, 50, -1, 52, 53, - 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, - 64, 65, 66, 67, 68, 69, -1, -1, -1, -1, - -1, 75, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 87, 88, 89, -1, -1, 1, -1, - 94, 95, -1, -1, 98, 99, 9, -1, 11, -1, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, -1, 27, 28, 29, 30, 31, 32, - -1, 34, 35, 36, 37, 38, 39, 40, 41, 42, - -1, -1, -1, 46, 47, 48, 49, 50, -1, 52, - 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, - 63, 64, 65, 66, 67, 68, 69, -1, -1, -1, - -1, -1, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 87, 88, 89, 1, -1, -1, - -1, 94, 95, -1, -1, 98, 99, 11, -1, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, -1, 27, 28, 29, 30, 31, -1, -1, - -1, -1, 36, -1, 39, 40, 41, 42, -1, -1, - -1, 46, -1, 48, 60, 61, 50, -1, 52, 53, - 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, - 64, 65, 66, 67, -1, 69, -1, 72, 73, 74, - 86, 75, -1, -1, -1, 91, 92, 93, -1, -1, - 96, -1, -1, 87, 88, 89, 1, -1, -1, -1, - 94, 95, 97, -1, 98, -1, 11, -1, 13, 14, - 15, 16, 17, 18, 19, -1, 21, 22, 23, 24, - 25, -1, 27, 28, 29, 30, 31, -1, -1, -1, - -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 50, -1, 52, 53, 54, - 55, 56, 57, -1, -1, -1, 0, 62, 63, 64, - 65, 66, 67, -1, 69, 9, -1, 11, 12, -1, - 75, -1, -1, -1, -1, -1, 20, -1, -1, -1, - -1, -1, 87, 88, 89, 58, 59, 60, 61, 94, - 95, -1, 97, 98, -1, 39, 40, 41, 42, -1, - -1, -1, 46, -1, 48, -1, -1, 51, -1, 82, - 83, 84, 85, 86, 58, 59, 60, 61, 91, 92, - 93, -1, -1, 96, -1, -1, -1, -1, 72, 73, - 74, 0, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 12, -1, -1, -1, 91, 92, 93, - -1, 20, 96, 97, -1, -1, -1, -1, -1, -1, - 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, - 39, 40, 41, 42, -1, -1, -1, 46, -1, 48, - -1, -1, 51, -1, -1, 83, 84, 85, 86, 58, - 59, 60, 61, 91, 92, 93, -1, -1, 96, -1, - -1, -1, -1, 72, 73, 74, -1, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, -1, -1, - -1, -1, 91, 92, 93, -1, -1, 96, 97, 9, - -1, 11, -1, 13, 14, 15, 16, 17, 18, 19, - -1, 21, 22, 23, 24, 25, -1, 27, 28, 29, - 30, 31, -1, -1, -1, -1, 36, -1, -1, -1, - -1, -1, -1, -1, 58, 59, 60, 61, -1, -1, - 50, -1, 52, 53, 54, 55, 56, 57, -1, -1, - -1, -1, 62, 63, 64, 65, 66, 67, -1, 69, - 84, 85, 86, -1, -1, 75, -1, 91, 92, 93, - -1, -1, 96, -1, -1, -1, -1, 87, 88, 89, - -1, -1, -1, -1, 94, 95, -1, 9, 98, 11, - -1, 13, 14, 15, 16, 17, 18, 19, -1, 21, - 22, 23, 24, 25, -1, 27, 28, 29, 30, 31, - -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, - -1, 58, 59, 60, 61, -1, -1, -1, 50, -1, - 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, - 62, 63, 64, 65, 66, 67, -1, 69, 85, 86, - -1, -1, -1, 75, 91, 92, 93, -1, -1, 96, - -1, -1, -1, -1, -1, 87, 88, 89, -1, -1, - -1, -1, 94, 95, -1, -1, 98, 11, 12, 13, + 67, 68, 69, -1, -1, -1, -1, -1, 75, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 87, 88, 89, 1, -1, -1, -1, 94, 95, 60, + 61, 98, 99, 11, -1, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, -1, 27, + 28, 29, 30, 31, -1, 86, -1, -1, 36, -1, + 91, 92, 93, -1, -1, 96, -1, -1, 58, 59, + 60, 61, 50, -1, 52, 53, 54, 55, 56, 57, + -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, + -1, 69, 82, 83, 84, 85, 86, 75, -1, -1, + -1, 91, 92, 93, -1, -1, 96, -1, -1, 87, + 88, 89, 1, -1, -1, -1, 94, 95, -1, -1, + 98, -1, 11, -1, 13, 14, 15, 16, 17, 18, + 19, -1, 21, 22, 23, 24, 25, -1, 27, 28, + 29, 30, 31, -1, -1, -1, -1, 36, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 50, -1, 52, 53, 54, 55, 56, 57, -1, + -1, -1, 0, 62, 63, 64, 65, 66, 67, -1, + 69, 9, -1, 11, 12, -1, 75, -1, -1, -1, + -1, -1, 20, -1, -1, -1, -1, -1, 87, 88, + 89, 58, 59, 60, 61, 94, 95, -1, 97, 98, + -1, 39, 40, 41, 42, -1, -1, -1, 46, -1, + 48, -1, -1, 51, -1, -1, 83, 84, 85, 86, + 58, 59, 60, 61, 91, 92, 93, -1, -1, 96, + -1, -1, -1, -1, 72, 73, 74, 0, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 12, + -1, -1, -1, 91, 92, 93, -1, 20, 96, 97, + -1, -1, -1, -1, -1, -1, 58, 59, 60, 61, + -1, -1, -1, -1, -1, -1, 39, 40, 41, 42, + -1, -1, -1, 46, -1, 48, -1, -1, 51, -1, + -1, -1, 84, 85, 86, 58, 59, 60, 61, 91, + 92, 93, -1, -1, 96, -1, -1, -1, -1, 72, + 73, 74, -1, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 85, 86, -1, -1, -1, -1, 91, 92, + 93, -1, -1, 96, 97, 9, -1, 11, -1, 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, 23, - 24, 25, -1, 27, 28, 29, 30, 31, -1, -1, + 24, 25, 26, 27, 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, 58, - -1, 60, 61, -1, -1, -1, 50, -1, 52, 53, + 59, 60, 61, -1, -1, -1, 50, -1, 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, -1, 69, 85, 86, -1, -1, -1, 75, 91, 92, 93, -1, -1, 96, -1, -1, -1, -1, -1, 87, 88, 89, -1, -1, -1, -1, - 94, 95, -1, 11, 98, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, -1, 27, + 94, 95, -1, 9, 98, 11, -1, 13, 14, 15, + 16, 17, 18, 19, -1, 21, 22, 23, 24, 25, + -1, 27, 28, 29, 30, 31, -1, -1, -1, -1, + 36, -1, -1, -1, -1, -1, -1, 58, -1, 60, + 61, -1, -1, -1, 50, -1, 52, 53, 54, 55, + 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, + 66, 67, -1, 69, 85, 86, -1, -1, -1, 75, + 91, 92, 93, -1, -1, 96, -1, -1, -1, -1, + -1, 87, 88, 89, -1, -1, -1, -1, 94, 95, + -1, 9, 98, 11, -1, 13, 14, 15, 16, 17, + 18, 19, -1, 21, 22, 23, 24, 25, -1, 27, 28, 29, 30, 31, -1, -1, -1, -1, 36, 39, 40, 41, 42, -1, -1, -1, 46, -1, 48, -1, -1, -1, 50, -1, 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, -1, 69, 72, 73, 74, -1, -1, 75, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, - 88, 89, -1, -1, -1, -1, 94, 95, -1, 11, - 98, 13, 14, 15, 16, 17, 18, 19, -1, 21, + 88, 89, -1, -1, -1, -1, 94, 95, -1, -1, + 98, 11, 12, 13, 14, 15, 16, 17, 18, 19, + -1, 21, 22, 23, 24, 25, -1, 27, 28, 29, + 30, 31, -1, -1, -1, -1, 36, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 50, -1, 52, 53, 54, 55, 56, 57, -1, -1, + -1, -1, 62, 63, 64, 65, 66, 67, -1, 69, + -1, -1, -1, -1, -1, 75, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 87, 88, 89, + -1, -1, -1, -1, 94, 95, -1, 11, 98, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, -1, 27, 28, 29, 30, 31, -1, -1, + -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 50, -1, 52, 53, + 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, + 64, 65, 66, 67, -1, 69, -1, -1, -1, -1, + -1, 75, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 87, 88, 89, -1, -1, -1, -1, + 94, 95, -1, 11, 98, 13, 14, 15, 16, 17, + 18, 19, -1, 21, 22, 23, 24, 25, -1, 27, + 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 50, -1, 52, 53, 54, 55, 56, 57, + -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, + -1, 69, -1, -1, -1, -1, -1, 75, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 87, + 88, 89, -1, -1, -1, -1, 94, 95, -1, 97, + 98, 11, -1, 13, 14, 15, 16, 17, 18, 19, + -1, 21, 22, 23, 24, 25, -1, 27, 28, 29, + 30, 31, -1, -1, -1, -1, 36, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 50, -1, 52, 53, 54, 55, 56, 57, -1, -1, + -1, -1, 62, 63, 64, 65, 66, 67, -1, 69, + -1, -1, -1, -1, -1, 75, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 87, 88, 89, + -1, -1, -1, -1, 94, 95, -1, 97, 98, 11, + -1, 13, 14, 15, 16, 17, 18, 19, -1, 21, 22, 23, 24, 25, -1, 27, 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, @@ -949,44 +970,19 @@ static const yytype_int16 yycheck[] = -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, 52, 53, 54, 55, 56, 57, -1, -1, -1, -1, 62, 63, - 64, 65, 66, 67, -1, 69, -1, -1, -1, -1, - -1, 75, -1, -1, -1, -1, -1, -1, -1, -1, + 64, 65, 66, 67, -1, 69, 51, -1, -1, -1, + -1, 75, -1, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, 87, 88, 89, -1, -1, -1, -1, - 94, 95, -1, 97, 98, 11, -1, 13, 14, 15, - 16, 17, 18, 19, -1, 21, 22, 23, 24, 25, - -1, 27, 28, 29, 30, 31, -1, -1, -1, -1, - 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 50, -1, 52, 53, 54, 55, - 56, 57, -1, -1, -1, -1, 62, 63, 64, 65, - 66, 67, -1, 69, -1, -1, -1, -1, -1, 75, + 94, 95, 77, 78, 98, 80, 81, 82, 83, 84, + 85, 86, -1, -1, -1, 51, 91, 92, 93, -1, + -1, 96, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 87, 88, 89, -1, -1, -1, -1, 94, 95, - -1, 97, 98, 11, -1, 13, 14, 15, 16, 17, - 18, 19, -1, 21, 22, 23, 24, 25, -1, 27, - 28, 29, 30, 31, -1, -1, -1, -1, 36, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 50, -1, 52, 53, 54, 55, 56, 57, - -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, - 386, 69, 388, -1, -1, -1, 392, 75, -1, -1, - -1, -1, -1, -1, -1, -1, 402, 403, -1, 87, - 88, 89, -1, -1, 410, 411, 94, 95, -1, -1, - 98, 51, -1, 419, -1, -1, -1, 423, 58, 59, - 60, 61, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 441, 442, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, -1, -1, -1, - 51, 91, 92, 93, -1, -1, 96, 58, 59, 60, - 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 77, 78, -1, 80, - 81, 82, 83, 84, 85, 86, -1, -1, -1, 51, - 91, 92, 93, -1, -1, 96, 58, 59, 60, 61, + -1, -1, 78, -1, 80, 81, 82, 83, 84, 85, + 86, -1, -1, -1, 51, 91, 92, 93, -1, -1, + 96, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 78, -1, 80, 81, - 82, 83, 84, 85, 86, -1, -1, -1, 51, 91, - 92, 93, -1, -1, 96, 58, 59, 60, 61, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 80, 81, 82, - 83, 84, 85, 86, -1, -1, -1, -1, 91, 92, - 93, -1, -1, 96 + -1, -1, -1, 80, 81, 82, 83, 84, 85, 86, + -1, -1, -1, -1, 91, 92, 93, -1, -1, 96 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -999,45 +995,45 @@ static const yytype_uint8 yystos[] = 28, 29, 30, 31, 36, 50, 52, 53, 54, 55, 56, 57, 62, 63, 64, 65, 66, 67, 69, 75, 87, 88, 89, 94, 95, 98, 138, 139, 140, 143, - 144, 145, 146, 147, 148, 149, 152, 156, 157, 158, - 159, 160, 161, 9, 108, 1, 20, 32, 34, 35, + 144, 145, 146, 147, 148, 149, 152, 154, 155, 156, + 157, 158, 159, 9, 108, 1, 20, 32, 34, 35, 37, 38, 39, 40, 41, 42, 46, 47, 48, 49, 68, 99, 108, 116, 119, 138, 33, 114, 115, 116, - 113, 113, 12, 138, 148, 148, 21, 26, 108, 157, - 162, 162, 162, 162, 162, 162, 162, 98, 11, 148, + 113, 113, 12, 138, 148, 148, 21, 26, 108, 155, + 160, 160, 160, 160, 160, 160, 160, 98, 11, 148, 131, 131, 148, 98, 98, 98, 108, 148, 21, 139, - 151, 157, 162, 162, 21, 108, 148, 157, 20, 138, - 21, 148, 98, 150, 157, 158, 159, 148, 139, 148, + 151, 155, 160, 160, 21, 108, 148, 155, 20, 138, + 21, 148, 98, 150, 155, 156, 157, 148, 139, 148, 148, 148, 148, 148, 97, 138, 72, 73, 74, 76, - 9, 11, 27, 98, 153, 51, 58, 59, 60, 61, - 77, 78, 80, 81, 82, 83, 84, 85, 86, 91, - 92, 93, 96, 153, 9, 11, 9, 11, 9, 109, - 132, 130, 21, 130, 153, 153, 153, 153, 67, 153, - 157, 153, 153, 108, 130, 45, 121, 20, 39, 40, - 41, 42, 46, 48, 115, 116, 114, 12, 151, 98, - 139, 138, 108, 24, 134, 97, 97, 138, 152, 162, - 139, 153, 153, 10, 20, 151, 97, 138, 70, 136, - 11, 97, 138, 138, 138, 148, 138, 138, 154, 97, - 138, 148, 148, 148, 148, 148, 148, 148, 148, 148, - 148, 148, 148, 148, 148, 148, 9, 11, 22, 98, - 142, 157, 97, 138, 138, 138, 138, 138, 138, 113, - 21, 129, 21, 133, 21, 117, 109, 109, 109, 109, - 109, 109, 153, 109, 109, 133, 108, 138, 125, 138, - 138, 138, 138, 138, 152, 97, 12, 141, 70, 135, - 97, 97, 138, 97, 138, 97, 138, 10, 97, 24, - 138, 11, 20, 12, 98, 97, 79, 138, 138, 97, - 138, 153, 97, 20, 12, 20, 12, 20, 10, 108, - 134, 9, 20, 21, 124, 138, 125, 126, 138, 125, - 128, 155, 157, 119, 123, 126, 127, 138, 109, 110, - 126, 134, 97, 151, 24, 108, 97, 97, 97, 12, - 138, 10, 148, 20, 12, 97, 152, 10, 10, 10, - 135, 109, 21, 97, 97, 97, 97, 153, 97, 20, - 126, 126, 97, 135, 12, 10, 97, 20, 108, 137, - 118, 151, 122, 122, 9, 111, 111, 126, 111, 124, - 97, 97, 111, 137, 113, 20, 111, 111, 112, 43, - 44, 120, 120, 97, 121, 20, 111, 111, 10, 121, - 121, 113, 111, 153, 111, 122, 121, 10, 126, 121, - 127, 97, 97, 111, 111, 120 + 9, 11, 98, 51, 58, 59, 60, 61, 77, 78, + 80, 81, 82, 83, 84, 85, 86, 91, 92, 93, + 96, 98, 9, 11, 9, 11, 9, 109, 132, 130, + 21, 130, 98, 98, 98, 98, 67, 98, 155, 98, + 98, 108, 130, 45, 121, 20, 39, 40, 41, 42, + 46, 48, 115, 116, 114, 12, 151, 98, 139, 138, + 108, 24, 134, 97, 97, 138, 152, 160, 139, 98, + 98, 10, 20, 151, 97, 138, 70, 136, 11, 97, + 138, 138, 138, 148, 138, 138, 97, 138, 148, 148, + 148, 148, 148, 148, 148, 148, 148, 148, 148, 148, + 148, 148, 148, 9, 11, 22, 98, 142, 155, 97, + 138, 138, 138, 138, 138, 138, 113, 21, 129, 21, + 133, 21, 117, 109, 109, 109, 109, 109, 109, 98, + 109, 109, 133, 108, 138, 125, 138, 138, 138, 138, + 138, 152, 97, 12, 141, 70, 135, 97, 97, 138, + 97, 138, 97, 138, 10, 97, 24, 138, 11, 20, + 12, 97, 79, 138, 138, 97, 138, 98, 97, 20, + 12, 20, 12, 20, 10, 108, 134, 9, 20, 21, + 124, 138, 125, 126, 138, 125, 128, 153, 155, 119, + 123, 126, 127, 138, 109, 110, 126, 134, 97, 151, + 24, 108, 97, 97, 97, 12, 138, 10, 148, 20, + 12, 97, 152, 10, 10, 10, 135, 109, 21, 97, + 97, 97, 97, 98, 97, 20, 126, 126, 97, 135, + 12, 10, 97, 20, 108, 137, 118, 151, 122, 122, + 9, 111, 111, 126, 111, 124, 97, 97, 111, 137, + 113, 20, 111, 111, 112, 43, 44, 120, 120, 97, + 121, 20, 111, 111, 10, 121, 121, 113, 111, 98, + 111, 122, 121, 10, 126, 121, 127, 97, 97, 111, + 111, 120 }; typedef enum { @@ -1068,12 +1064,11 @@ static const toketypes yy_type_tab[] = toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_i_tkval, toketype_ival, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval }; /* Generated from: - * dbb2439b7793bc662fb61a937ef279c1e367658eb7b8755c88b0e9c61116ed55 perly.y + * 1af5c1e4d01014cbed653334fdeeda12fe7b75b193865ba9ea67e0ad9606413b perly.y * 738ca60a0b4cb075902435e976a2f393d438e8e6e32ba81e037dd773b75c87b5 regen_perly.pl * ex: set ro: */ diff --git a/perly.y b/perly.y index a8adefb82c..56df87349c 100644 --- a/perly.y +++ b/perly.y @@ -87,8 +87,6 @@ %token LOCAL MY MYSUB REQUIRE %token COLONATTR -%type lpar_or_qw - %type grammar remember mremember %type startsub startanonsub startformsub /* FIXME for MAD - are these two ival? */ @@ -362,7 +360,7 @@ barestmt: PLUGSTMT $$ = (OP*)NULL; #endif } - | IF lpar_or_qw remember mexpr ')' mblock else + | IF '(' remember mexpr ')' mblock else { $$ = block_end($3, newCONDOP(0, $4, op_scope($6), $7)); @@ -371,7 +369,7 @@ barestmt: PLUGSTMT TOKEN_GETMAD($5,$$,')'); PL_parser->copline = (line_t)IVAL($1); } - | UNLESS lpar_or_qw remember miexpr ')' mblock else + | UNLESS '(' remember miexpr ')' mblock else { $$ = block_end($3, newCONDOP(0, $4, op_scope($6), $7)); @@ -380,17 +378,17 @@ barestmt: PLUGSTMT TOKEN_GETMAD($5,$$,')'); PL_parser->copline = (line_t)IVAL($1); } - | GIVEN lpar_or_qw remember mydefsv mexpr ')' mblock + | GIVEN '(' remember mydefsv mexpr ')' mblock { $$ = block_end($3, newGIVENOP($5, op_scope($7), (PADOFFSET)$4)); PL_parser->copline = (line_t)IVAL($1); } - | WHEN lpar_or_qw remember mexpr ')' mblock + | WHEN '(' remember mexpr ')' mblock { $$ = block_end($3, newWHENOP($4, op_scope($6))); } | DEFAULT block { $$ = newWHENOP(0, op_scope($2)); } - | WHILE lpar_or_qw remember texpr ')' mintro mblock cont + | WHILE '(' remember texpr ')' mintro mblock cont { $$ = block_end($3, newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -400,7 +398,7 @@ barestmt: PLUGSTMT TOKEN_GETMAD($5,$$,')'); PL_parser->copline = (line_t)IVAL($1); } - | UNTIL lpar_or_qw remember iexpr ')' mintro mblock cont + | UNTIL '(' remember iexpr ')' mintro mblock cont { $$ = block_end($3, newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -410,7 +408,7 @@ barestmt: PLUGSTMT TOKEN_GETMAD($5,$$,')'); PL_parser->copline = (line_t)IVAL($1); } - | FOR lpar_or_qw remember mnexpr ';' texpr ';' mintro mnexpr ')' + | FOR '(' remember mnexpr ';' texpr ';' mintro mnexpr ')' mblock { OP *initop = IF_MAD($4 ? $4 : newOP(OP_NULL, 0), $4); @@ -431,7 +429,7 @@ barestmt: PLUGSTMT TOKEN_GETMAD($10,$$,')'); PL_parser->copline = (line_t)IVAL($1); } - | FOR MY remember my_scalar lpar_or_qw mexpr ')' mblock cont + | FOR MY remember my_scalar '(' mexpr ')' mblock cont { $$ = block_end($3, newFOROP(0, $4, $6, $8, $9)); TOKEN_GETMAD($1,$$,'W'); @@ -440,7 +438,7 @@ barestmt: PLUGSTMT TOKEN_GETMAD($7,$$,')'); PL_parser->copline = (line_t)IVAL($1); } - | FOR scalar lpar_or_qw remember mexpr ')' mblock cont + | FOR scalar '(' remember mexpr ')' mblock cont { $$ = block_end($4, newFOROP(0, op_lvalue($2, OP_ENTERLOOP), $5, $7, $8)); @@ -449,7 +447,7 @@ barestmt: PLUGSTMT TOKEN_GETMAD($6,$$,')'); PL_parser->copline = (line_t)IVAL($1); } - | FOR lpar_or_qw remember mexpr ')' mblock cont + | FOR '(' remember mexpr ')' mblock cont { $$ = block_end($3, newFOROP(0, (OP*)NULL, $4, $6, $7)); @@ -544,7 +542,7 @@ else : /* NULL */ $$ = op_scope($2); TOKEN_GETMAD($1,$$,'o'); } - | ELSIF lpar_or_qw mexpr ')' mblock else + | ELSIF '(' mexpr ')' mblock else { PL_parser->copline = (line_t)IVAL($1); $$ = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,$3), @@ -732,7 +730,7 @@ listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */ TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($5,$$,')'); } - | term ARROW method lpar_or_qw optexpr ')' /* $foo->bar(list) */ + | term ARROW method '(' optexpr ')' /* $foo->bar(list) */ { $$ = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, scalar($1), $5), @@ -858,14 +856,14 @@ subscripted: star '{' expr ';' '}' /* *main::{something} */ TOKEN_GETMAD($5,$$,')'); } - | subscripted lpar_or_qw expr ')' /* $foo->{bar}->(@args) */ + | subscripted '(' expr ')' /* $foo->{bar}->(@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, $3, newCVREF(0, scalar($1)))); TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($4,$$,')'); } - | subscripted lpar_or_qw ')' /* $foo->{bar}->() */ + | subscripted '(' ')' /* $foo->{bar}->() */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar($1))); TOKEN_GETMAD($2,$$,'('); @@ -1049,7 +1047,7 @@ termdo : DO term %prec UNIOP /* do $filename */ { $$ = newUNOP(OP_NULL, OPf_SPECIAL, op_scope($2)); TOKEN_GETMAD($1,$$,'D'); } - | DO WORD lpar_or_qw ')' /* do somesub() */ + | DO WORD '(' ')' /* do somesub() */ { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, @@ -1061,7 +1059,7 @@ termdo : DO term %prec UNIOP /* do $filename */ TOKEN_GETMAD($3,$$,'('); TOKEN_GETMAD($4,$$,')'); } - | DO WORD lpar_or_qw expr ')' /* do somesub(@args) */ + | DO WORD '(' expr ')' /* do somesub(@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_append_elem(OP_LIST, @@ -1074,7 +1072,7 @@ termdo : DO term %prec UNIOP /* do $filename */ TOKEN_GETMAD($3,$$,'('); TOKEN_GETMAD($5,$$,')'); } - | DO scalar lpar_or_qw ')' /* do $subref () */ + | DO scalar '(' ')' /* do $subref () */ { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, scalar(newCVREF(0,scalar($2))), (OP*)NULL)); dep(); @@ -1082,7 +1080,7 @@ termdo : DO term %prec UNIOP /* do $filename */ TOKEN_GETMAD($3,$$,'('); TOKEN_GETMAD($4,$$,')'); } - | DO scalar lpar_or_qw expr ')' /* do $subref (@args) */ + | DO scalar '(' expr ')' /* do $subref (@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, $4, @@ -1161,12 +1159,12 @@ term : termbinop { $$ = $1; } | amper /* &foo; */ { $$ = newUNOP(OP_ENTERSUB, 0, scalar($1)); } - | amper lpar_or_qw ')' /* &foo() */ + | amper '(' ')' /* &foo() */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1)); TOKEN_GETMAD($2,$$,'('); TOKEN_GETMAD($3,$$,')'); } - | amper lpar_or_qw expr ')' /* &foo(@args) */ + | amper '(' expr ')' /* &foo(@args) */ { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, $3, scalar($1))); @@ -1313,14 +1311,6 @@ optexpr: /* NULL */ { $$ = $1; } ; -lpar_or_qw: '(' - { $$ = $1; } - | QWLIST - { munge_qwlist_to_paren_list($1); } - '(' - { $$ = $3; } - ; - /* A little bit of trickery to make "for my $foo (@bar)" actually be lexical */ my_scalar: scalar diff --git a/pod/perldiag.pod b/pod/perldiag.pod index 80af627a37..6e63c05d57 100644 --- a/pod/perldiag.pod +++ b/pod/perldiag.pod @@ -5217,17 +5217,6 @@ will be available for use in new operators in the future. Write C instead, explicitly using the C operator: the question mark delimiter still invokes match-once behaviour. -=item Use of qw(...) as parentheses is deprecated - -(D deprecated) You have something like C, -using a C list literal where a parenthesised expression is -expected. Historically the parser fooled itself into thinking that -C literals were always enclosed in parentheses, and as a result -you could sometimes omit parentheses around them. (You could never do -the C that you might have expected, though.) -The parser no longer lies to itself in this way. Wrap the list literal -in parentheses, like C. - =item Use of reference "%s" as array index (W misc) You tried to use a reference as an array index; this probably diff --git a/proto.h b/proto.h index 9d47ba5c85..04657c393e 100644 --- a/proto.h +++ b/proto.h @@ -2341,11 +2341,6 @@ PERL_CALLCONV SV* Perl_mro_set_private_data(pTHX_ struct mro_meta *const smeta, #define PERL_ARGS_ASSERT_MRO_SET_PRIVATE_DATA \ assert(smeta); assert(which); assert(data) -PERL_CALLCONV void Perl_munge_qwlist_to_paren_list(pTHX_ OP* qwlist) - __attribute__nonnull__(pTHX_1); -#define PERL_ARGS_ASSERT_MUNGE_QWLIST_TO_PAREN_LIST \ - assert(qwlist) - PERL_CALLCONV NV Perl_my_atof(pTHX_ const char *s) __attribute__nonnull__(pTHX_1); #define PERL_ARGS_ASSERT_MY_ATOF \ diff --git a/t/lib/warnings/perly b/t/lib/warnings/perly index 02e29fde2e..c912c0ea3c 100644 --- a/t/lib/warnings/perly +++ b/t/lib/warnings/perly @@ -8,23 +8,6 @@ sub fred {} $a = "fred" ; do $a() sub fred {} $a = "fred" ; do $a(1) - Use of qw(...) as parentheses is deprecated - - if qw(a) {} - unless qw(a) {} - if (0) {} elsif qw(a) {} - given qw(a) {} - when qw(a) {} - while qw(a) {} - until qw(a) {} - foreach $x qw(a b c) {} - foreach my $x qw(a b c) {} - $obj->meth qw(a b c) - do foo qw(a b c) - do $subref qw(a b c) - &foo qw(a b c) - $a[0] qw(a b c) - __END__ # perly.y use warnings 'deprecated' ; @@ -45,222 +28,3 @@ Use of "do" to call subroutines is deprecated at - line 4. Use of "do" to call subroutines is deprecated at - line 5. Use of "do" to call subroutines is deprecated at - line 7. Use of "do" to call subroutines is deprecated at - line 8. -######## -use warnings qw(deprecated void); -if qw(a) { print "x0\n"; } else { } -if qw(0) { print "x1\n"; } else { } -if qw(z a) { print "x2\n"; } else { } -if qw(z 0) { print "x3\n"; } else { } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Use of qw(...) as parentheses is deprecated at - line 4. -Useless use of a constant (z) in void context at - line 4. -Use of qw(...) as parentheses is deprecated at - line 5. -Useless use of a constant (z) in void context at - line 5. -x0 -x2 -######## -if qw() { print "x0\n"; } else { } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -syntax error at - line 1, near "if qw()" -Execution of - aborted due to compilation errors. -######## -use warnings qw(deprecated void); -unless qw(a) { print "x0\n"; } else { } -unless qw(0) { print "x1\n"; } else { } -unless qw(z a) { print "x2\n"; } else { } -unless qw(z 0) { print "x3\n"; } else { } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Use of qw(...) as parentheses is deprecated at - line 4. -Useless use of a constant (z) in void context at - line 4. -Use of qw(...) as parentheses is deprecated at - line 5. -Useless use of a constant (z) in void context at - line 5. -x1 -x3 -######## -unless qw() { print "x0\n"; } else { } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -syntax error at - line 1, near "unless qw()" -Execution of - aborted due to compilation errors. -######## -use warnings qw(deprecated void); -if(0) { print "eek\n"; } elsif qw(a) { print "x0\n"; } else { } -if(0) { print "eek\n"; } elsif qw(0) { print "x1\n"; } else { } -if(0) { print "eek\n"; } elsif qw(z a) { print "x2\n"; } else { } -if(0) { print "eek\n"; } elsif qw(z 0) { print "x3\n"; } else { } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Use of qw(...) as parentheses is deprecated at - line 4. -Useless use of a constant (z) in void context at - line 4. -Use of qw(...) as parentheses is deprecated at - line 5. -Useless use of a constant (z) in void context at - line 5. -x0 -x2 -######## -if(0) { print "eek\n"; } elsif qw() { print "x0\n"; } else { } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -syntax error at - line 1, near "elsif qw()" -Execution of - aborted due to compilation errors. -######## -use warnings qw(deprecated void); use feature "switch"; -given qw(a) { print "x0 $_\n"; } -given qw(z a) { print "x1 $_\n"; } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Useless use of a constant (z) in void context at - line 3. -x0 a -x1 a -######## -use feature "switch"; -given qw() { print "x0\n"; } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -syntax error at - line 2, near "given qw()" -Execution of - aborted due to compilation errors. -######## -use warnings qw(deprecated void); use feature "switch"; -given("a") { when qw(a) { print "x0\n"; } } -given("a") { when qw(b) { print "x1\n"; } } -given("a") { when qw(z a) { print "x2\n"; } } -given("a") { when qw(z b) { print "x3\n"; } } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Use of qw(...) as parentheses is deprecated at - line 4. -Useless use of a constant (z) in void context at - line 4. -Use of qw(...) as parentheses is deprecated at - line 5. -Useless use of a constant (z) in void context at - line 5. -x0 -x2 -######## -use feature "switch"; -given("a") { when qw() { print "x0\n"; } } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -syntax error at - line 2, near "when qw()" -syntax error at - line 2, near "} }" -Execution of - aborted due to compilation errors. -######## -use warnings qw(deprecated void); -while qw(a) { print "x0\n"; last; } {;} -while qw(0) { print "x1\n"; last; } {;} -while qw(z a) { print "x2\n"; last; } {;} -while qw(z 0) { print "x3\n"; last; } {;} -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Use of qw(...) as parentheses is deprecated at - line 4. -Useless use of a constant (z) in void context at - line 4. -Use of qw(...) as parentheses is deprecated at - line 5. -Useless use of a constant (z) in void context at - line 5. -x0 -x2 -######## -while qw() { print "x0\n"; last; } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -x0 -######## -use warnings qw(deprecated void); -until qw(a) { print "x0\n"; last; } {;} -until qw(0) { print "x1\n"; last; } {;} -until qw(z a) { print "x2\n"; last; } {;} -until qw(z 0) { print "x3\n"; last; } {;} -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Use of qw(...) as parentheses is deprecated at - line 4. -Useless use of a constant (z) in void context at - line 4. -Use of qw(...) as parentheses is deprecated at - line 5. -Useless use of a constant (z) in void context at - line 5. -x1 -x3 -######## -until qw() { print "x0\n"; } else { } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -syntax error at - line 1, near "until qw()" -Execution of - aborted due to compilation errors. -######## -foreach $x qw(a b c) { print $x, "\n"; } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -a -b -c -######## -foreach $x qw() { print $x, "\n"; } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -syntax error at - line 1, near "$x qw()" -Execution of - aborted due to compilation errors. -######## -foreach my $x qw(a b c) { print $x, "\n"; } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -a -b -c -######## -foreach my $x qw() { print $x, "\n"; } -EXPECT -Use of qw(...) as parentheses is deprecated at - line 1. -syntax error at - line 1, near "$x qw()" -Execution of - aborted due to compilation errors. -######## -sub a5c85eef3bf30129e20989e96b099d13::foo { print "+", join(":", @_), "\n"; } -"a5c85eef3bf30129e20989e96b099d13"->foo qw(); {;} -"a5c85eef3bf30129e20989e96b099d13"->foo qw(a b c); {;} -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -+a5c85eef3bf30129e20989e96b099d13 -+a5c85eef3bf30129e20989e96b099d13:a:b:c -######## -sub fd4de2af1449cec72693c36842d41862 { print "+", join(":", @_), "\n"; } -do fd4de2af1449cec72693c36842d41862 qw(); {;} -do fd4de2af1449cec72693c36842d41862 qw(a b c); {;} -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of "do" to call subroutines is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Use of "do" to call subroutines is deprecated at - line 3. -+ -+a:b:c -######## -$subref = sub { print "+", join(":", @_), "\n"; }; -do $subref qw(); -do $subref qw(a b c); -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of "do" to call subroutines is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -Use of "do" to call subroutines is deprecated at - line 3. -+ -+a:b:c -######## -sub e293a8f7cb38880a48867fcb336448e5 { print "+", join(":", @_), "\n"; } -&e293a8f7cb38880a48867fcb336448e5 qw(); -&e293a8f7cb38880a48867fcb336448e5 qw(a b c); -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -+ -+a:b:c -######## -my @a = (sub { print "+", join(":", @_), "\n"; }); -$a[0] qw(); -$a[0] qw(a b c); -EXPECT -Use of qw(...) as parentheses is deprecated at - line 2. -Use of qw(...) as parentheses is deprecated at - line 3. -+ -+a:b:c diff --git a/toke.c b/toke.c index 3686162c60..f4bc2a78a1 100644 --- a/toke.c +++ b/toke.c @@ -11405,23 +11405,6 @@ Perl_parse_stmtseq(pTHX_ U32 flags) return stmtseqop; } -void -Perl_munge_qwlist_to_paren_list(pTHX_ OP *qwlist) -{ - PERL_ARGS_ASSERT_MUNGE_QWLIST_TO_PAREN_LIST; - deprecate("qw(...) as parentheses"); - force_next((4<<24)|')'); - if (qwlist->op_type == OP_STUB) { - op_free(qwlist); - } - else { - start_force(PL_curforce); - NEXTVAL_NEXTTOKE.opval = qwlist; - force_next(THING); - } - force_next((2<<24)|'('); -} - /* * Local variables: * c-indentation-style: bsd -- cgit v1.2.1