In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/5f211341d665e81a03fbd4935e4e87f70d937fc3?hp=74401f9c0e7d7248493d3f2bb0f4fdb0b20a92aa>
- Log ----------------------------------------------------------------- commit 5f211341d665e81a03fbd4935e4e87f70d937fc3 Author: Zefram <[email protected]> Date: Sat Oct 16 22:22:57 2010 +0100 permit labels to appear before declarations Include <label> in productions before <decl> and <package_block>. This means that labels can now appear at the beginning of all statement-like things. There was no technical reason for the restriction of labels to substantive statements, and that restriction in any case couldn't be applied to PLUGSTMT-based plugged-in declarations. ----------------------------------------------------------------------- Summary of changes: perly.act | 817 ++++++++++++++++++------------------ perly.h | 2 +- perly.tab | 1309 ++++++++++++++++++++++++++++----------------------------- perly.y | 52 +-- t/comp/decl.t | 22 +- t/op/attrs.t | 2 +- t/op/goto.t | 76 ++++- 7 files changed, 1178 insertions(+), 1102 deletions(-) diff --git a/perly.act b/perly.act index 72cd3bf..95817d5 100644 --- a/perly.act +++ b/perly.act @@ -13,6 +13,7 @@ case 2: case 4: #line 151 "perly.y" { + PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; yyunlex(); @@ -21,15 +22,16 @@ case 2: break; case 5: -#line 158 "perly.y" +#line 159 "perly.y" { parser->expect = XSTATE; ;} break; case 6: -#line 162 "perly.y" +#line 163 "perly.y" { + PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; yyunlex(); @@ -38,14 +40,14 @@ case 2: break; case 7: -#line 169 "perly.y" +#line 171 "perly.y" { parser->expect = XSTATE; ;} break; case 8: -#line 173 "perly.y" +#line 175 "perly.y" { PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; @@ -53,12 +55,12 @@ case 2: break; case 9: -#line 182 "perly.y" +#line 184 "perly.y" { (yyval.ival) = (ps[(1) - (2)].val.ival); newPROG(block_end((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval))); ;} break; case 10: -#line 187 "perly.y" +#line 189 "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)); @@ -68,24 +70,24 @@ case 2: break; case 11: -#line 196 "perly.y" +#line 198 "perly.y" { (yyval.ival) = block_start(TRUE); ;} break; case 12: -#line 200 "perly.y" +#line 202 "perly.y" { (yyval.ival) = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); ;} break; case 13: -#line 204 "perly.y" +#line 206 "perly.y" { PL_parser->expect = XSTATE; (yyval.ival) = block_start(TRUE); ;} break; case 14: -#line 211 "perly.y" +#line 213 "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)); @@ -95,24 +97,17 @@ case 2: break; case 15: -#line 220 "perly.y" +#line 222 "perly.y" { (yyval.ival) = block_start(FALSE); ;} break; case 16: -#line 225 "perly.y" +#line 227 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 17: -#line 227 "perly.y" - { - (yyval.opval) = IF_MAD(op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval)), (ps[(1) - (2)].val.opval)); - ;} - break; - - case 18: -#line 231 "perly.y" +#line 229 "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)) @@ -120,37 +115,24 @@ case 2: ;} break; - case 19: -#line 240 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} - break; - - case 20: -#line 242 "perly.y" - { - PL_pad_reset_pending = TRUE; - (yyval.opval) = (ps[(1) - (1)].val.opval); - ;} - break; - - case 21: -#line 250 "perly.y" + case 18: +#line 238 "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),((LISTOP*)(yyval.opval))->op_first,'L'); ;} break; - case 23: -#line 254 "perly.y" + case 20: +#line 242 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 24: -#line 256 "perly.y" + case 21: +#line 244 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;} break; - case 25: -#line 258 "perly.y" + case 22: +#line 246 "perly.y" { if (PVAL((ps[(1) - (2)].val.p_tkval))) { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), newOP(OP_NULL, 0)); @@ -169,8 +151,8 @@ case 2: ;} break; - case 26: -#line 275 "perly.y" + case 23: +#line 263 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)), (ps[(2) - (3)].val.opval)); PL_parser->expect = XSTATE; @@ -188,84 +170,95 @@ case 2: ;} break; - case 27: -#line 291 "perly.y" - { (yyval.opval) = newSTATEOP(0, NULL, + case 24: +#line 279 "perly.y" + { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, - NOLINE, (OP*)NULL, (ps[(1) - (1)].val.opval), + NOLINE, (OP*)NULL, (ps[(2) - (2)].val.opval), (OP*)NULL, 0)); ;} break; - case 28: -#line 296 "perly.y" + case 25: +#line 284 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;} break; - case 29: -#line 301 "perly.y" + case 26: +#line 286 "perly.y" + { + if (PVAL((ps[(1) - (2)].val.p_tkval))) { + (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); + } else { + (yyval.opval) = IF_MAD((ps[(2) - (2)].val.opval) ? (ps[(2) - (2)].val.opval) : newOP(OP_NULL, 0), (ps[(2) - (2)].val.opval)); + } + ;} + break; + + case 27: +#line 297 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 30: -#line 303 "perly.y" + case 28: +#line 299 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 31: -#line 305 "perly.y" + case 29: +#line 301 "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 32: -#line 309 "perly.y" + case 30: +#line 305 "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 33: -#line 313 "perly.y" + case 31: +#line 309 "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 34: -#line 317 "perly.y" + case 32: +#line 313 "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 35: -#line 321 "perly.y" + case 33: +#line 317 "perly.y" { (yyval.opval) = newFOROP(0, NULL, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)), (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w'); ;} break; - case 36: -#line 326 "perly.y" + case 34: +#line 322 "perly.y" { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), scope((ps[(1) - (3)].val.opval))); ;} break; - case 37: -#line 331 "perly.y" + case 35: +#line 327 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 38: -#line 333 "perly.y" + case 36: +#line 329 "perly.y" { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 39: -#line 337 "perly.y" + case 37: +#line 333 "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)), scope((ps[(5) - (6)].val.opval)), (ps[(6) - (6)].val.opval)); PL_hints |= HINT_BLOCK_SCOPE; @@ -275,8 +268,8 @@ case 2: ;} break; - case 40: -#line 348 "perly.y" + case 38: +#line 344 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -286,8 +279,8 @@ case 2: ;} break; - case 41: -#line 356 "perly.y" + case 39: +#line 352 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -297,31 +290,31 @@ case 2: ;} break; - case 42: -#line 367 "perly.y" + case 40: +#line 363 "perly.y" { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), scope((ps[(6) - (6)].val.opval)))); ;} break; - case 43: -#line 370 "perly.y" + case 41: +#line 366 "perly.y" { (yyval.opval) = newWHENOP(0, scope((ps[(2) - (2)].val.opval))); ;} break; - case 44: -#line 375 "perly.y" + case 42: +#line 371 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 45: -#line 377 "perly.y" + case 43: +#line 373 "perly.y" { (yyval.opval) = scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 46: -#line 384 "perly.y" + case 44: +#line 380 "perly.y" { OP *innerop; PL_parser->copline = (line_t)IVAL((ps[(2) - (9)].val.i_tkval)); (yyval.opval) = block_end((ps[(4) - (9)].val.ival), @@ -335,8 +328,8 @@ case 2: ;} break; - case 47: -#line 397 "perly.y" + case 45: +#line 393 "perly.y" { OP *innerop; PL_parser->copline = (line_t)IVAL((ps[(2) - (9)].val.i_tkval)); (yyval.opval) = block_end((ps[(4) - (9)].val.ival), @@ -350,8 +343,8 @@ case 2: ;} break; - case 48: -#line 409 "perly.y" + case 46: +#line 405 "perly.y" { OP *innerop; (yyval.opval) = block_end((ps[(4) - (10)].val.ival), innerop = newFOROP(0, PVAL((ps[(1) - (10)].val.p_tkval)), (line_t)IVAL((ps[(2) - (10)].val.i_tkval)), @@ -364,8 +357,8 @@ case 2: ;} break; - case 49: -#line 420 "perly.y" + case 47: +#line 416 "perly.y" { OP *innerop; (yyval.opval) = block_end((ps[(5) - (9)].val.ival), innerop = newFOROP(0, PVAL((ps[(1) - (9)].val.p_tkval)), (line_t)IVAL((ps[(2) - (9)].val.i_tkval)), @@ -377,8 +370,8 @@ case 2: ;} break; - case 50: -#line 430 "perly.y" + case 48: +#line 426 "perly.y" { OP *innerop; (yyval.opval) = block_end((ps[(4) - (8)].val.ival), innerop = newFOROP(0, PVAL((ps[(1) - (8)].val.p_tkval)), (line_t)IVAL((ps[(2) - (8)].val.i_tkval)), @@ -390,8 +383,8 @@ case 2: ;} break; - case 51: -#line 442 "perly.y" + case 49: +#line 438 "perly.y" { OP *forop; PL_parser->copline = (line_t)IVAL((ps[(2) - (12)].val.i_tkval)); forop = newSTATEOP(0, PVAL((ps[(1) - (12)].val.p_tkval)), @@ -423,16 +416,16 @@ case 2: (yyval.opval) = block_end((ps[(4) - (12)].val.ival), forop); ;} break; - case 52: -#line 472 "perly.y" + case 50: +#line 468 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, NOLINE, (OP*)NULL, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0)); TOKEN_GETMAD((ps[(1) - (3)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;} break; - case 53: -#line 480 "perly.y" + case 51: +#line 476 "perly.y" { PL_parser->copline = (line_t) IVAL((ps[(2) - (8)].val.i_tkval)); (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newSTATEOP(0, PVAL((ps[(1) - (8)].val.p_tkval)), @@ -440,47 +433,47 @@ case 2: (PADOFFSET) (ps[(5) - (8)].val.ival)) )); ;} break; - case 54: -#line 489 "perly.y" + case 52: +#line 485 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); ;} break; - case 55: -#line 495 "perly.y" + case 53: +#line 491 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 57: -#line 501 "perly.y" + case 55: +#line 497 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; ;} break; - case 59: -#line 509 "perly.y" + case 57: +#line 505 "perly.y" { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} break; - case 60: -#line 514 "perly.y" + case 58: +#line 510 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 61: -#line 518 "perly.y" + case 59: +#line 514 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 62: -#line 522 "perly.y" + case 60: +#line 518 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 63: -#line 527 "perly.y" + case 61: +#line 523 "perly.y" { #ifdef MAD YYSTYPE tmplval; @@ -492,6 +485,16 @@ case 2: ;} break; + case 63: +#line 537 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + + case 64: +#line 539 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + case 65: #line 541 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} @@ -508,29 +511,19 @@ case 2: break; case 68: -#line 547 "perly.y" +#line 550 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 69: -#line 549 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} - break; - - case 70: #line 554 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} - break; - - case 71: -#line 558 "perly.y" { (yyval.opval) = newOP(OP_NULL,0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p'); ;} break; - case 72: -#line 564 "perly.y" + case 70: +#line 560 "perly.y" { CV *fmtcv = PL_compcv; SvREFCNT_inc_simple_void(PL_compcv); @@ -550,18 +543,18 @@ case 2: ;} break; - case 73: -#line 583 "perly.y" + case 71: +#line 579 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 74: -#line 584 "perly.y" + case 72: +#line 580 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 75: -#line 589 "perly.y" + case 73: +#line 585 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD (yyval.opval) = newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval)); @@ -573,8 +566,8 @@ case 2: ;} break; - case 76: -#line 602 "perly.y" + case 74: +#line 598 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD { @@ -596,26 +589,26 @@ case 2: ;} break; - case 77: -#line 624 "perly.y" + case 75: +#line 620 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); ;} break; - case 78: -#line 630 "perly.y" + case 76: +#line 626 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); ;} break; - case 79: -#line 635 "perly.y" + case 77: +#line 631 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); ;} break; - case 80: -#line 640 "perly.y" + case 78: +#line 636 "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") @@ -624,25 +617,25 @@ case 2: (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 81: -#line 650 "perly.y" + case 79: +#line 646 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 83: -#line 656 "perly.y" + case 81: +#line 652 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 84: -#line 658 "perly.y" + case 82: +#line 654 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 85: -#line 662 "perly.y" + case 83: +#line 658 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -651,15 +644,15 @@ case 2: ;} break; - case 86: -#line 672 "perly.y" + case 84: +#line 668 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 87: -#line 676 "perly.y" + case 85: +#line 672 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -668,13 +661,13 @@ case 2: ;} break; - case 88: -#line 685 "perly.y" + case 86: +#line 681 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 89: -#line 686 "perly.y" + case 87: +#line 682 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL,0), (OP*)NULL @@ -684,8 +677,8 @@ case 2: ;} break; - case 90: -#line 696 "perly.y" + case 88: +#line 692 "perly.y" { #ifdef MAD (yyval.opval) = package((ps[(3) - (4)].val.opval)); @@ -702,8 +695,8 @@ case 2: ;} break; - case 91: -#line 713 "perly.y" + case 89: +#line 709 "perly.y" { int save_3_latefree = (ps[(3) - (5)].val.opval)->op_latefree; (ps[(3) - (5)].val.opval)->op_latefree = 1; @@ -718,8 +711,8 @@ case 2: ;} break; - case 92: -#line 726 "perly.y" + case 90: +#line 722 "perly.y" { if (PL_parser->copline > (line_t)IVAL((ps[(4) - (8)].val.i_tkval))) PL_parser->copline = (line_t)IVAL((ps[(4) - (8)].val.i_tkval)); (yyval.opval) = block_end((ps[(5) - (8)].val.ival), (ps[(7) - (8)].val.opval)); @@ -731,13 +724,13 @@ case 2: ;} break; - case 93: -#line 738 "perly.y" + case 91: +#line 734 "perly.y" { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} break; - case 94: -#line 740 "perly.y" + case 92: +#line 736 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD (yyval.opval) = utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval)); @@ -753,29 +746,29 @@ case 2: ;} break; - case 95: -#line 757 "perly.y" + case 93: +#line 753 "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 96: -#line 761 "perly.y" + case 94: +#line 757 "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 97: -#line 765 "perly.y" + case 95: +#line 761 "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 99: -#line 773 "perly.y" + case 97: +#line 769 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -787,8 +780,8 @@ case 2: ;} break; - case 100: -#line 783 "perly.y" + case 98: +#line 779 "perly.y" { OP* term = (ps[(3) - (3)].val.opval); DO_MAD( @@ -799,16 +792,16 @@ case 2: ;} break; - case 102: -#line 796 "perly.y" + case 100: +#line 792 "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'); ;} break; - case 103: -#line 801 "perly.y" + case 101: +#line 797 "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'); @@ -817,8 +810,8 @@ case 2: ;} break; - case 104: -#line 808 "perly.y" + case 102: +#line 804 "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)), @@ -829,8 +822,8 @@ case 2: ;} break; - case 105: -#line 817 "perly.y" + case 103: +#line 813 "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)))); @@ -838,8 +831,8 @@ case 2: ;} break; - case 106: -#line 823 "perly.y" + case 104: +#line 819 "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)), @@ -847,8 +840,8 @@ case 2: ;} break; - case 107: -#line 829 "perly.y" + case 105: +#line 825 "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)), @@ -858,15 +851,15 @@ case 2: ;} break; - case 108: -#line 837 "perly.y" + case 106: +#line 833 "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 109: -#line 841 "perly.y" + case 107: +#line 837 "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),'('); @@ -874,22 +867,22 @@ case 2: ;} break; - case 110: -#line 847 "perly.y" + case 108: +#line 843 "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 111: -#line 850 "perly.y" + case 109: +#line 846 "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))); ;} break; - case 114: -#line 865 "perly.y" + case 112: +#line 861 "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),'{'); @@ -898,16 +891,16 @@ case 2: ;} break; - case 115: -#line 872 "perly.y" + case 113: +#line 868 "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),']'); ;} break; - case 116: -#line 877 "perly.y" + case 114: +#line 873 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV), scalar((ps[(4) - (5)].val.opval))); @@ -917,8 +910,8 @@ case 2: ;} break; - case 117: -#line 885 "perly.y" + case 115: +#line 881 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV), scalar((ps[(3) - (4)].val.opval))); @@ -927,8 +920,8 @@ case 2: ;} break; - case 118: -#line 892 "perly.y" + case 116: +#line 888 "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),'{'); @@ -937,8 +930,8 @@ case 2: ;} break; - case 119: -#line 899 "perly.y" + case 117: +#line 895 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV), jmaybe((ps[(4) - (6)].val.opval))); @@ -950,8 +943,8 @@ case 2: ;} break; - case 120: -#line 909 "perly.y" + case 118: +#line 905 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV), jmaybe((ps[(3) - (5)].val.opval))); @@ -962,8 +955,8 @@ case 2: ;} break; - case 121: -#line 918 "perly.y" + case 119: +#line 914 "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'); @@ -972,8 +965,8 @@ case 2: ;} break; - case 122: -#line 925 "perly.y" + case 120: +#line 921 "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))))); @@ -983,8 +976,8 @@ case 2: ;} break; - case 123: -#line 934 "perly.y" + case 121: +#line 930 "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))))); @@ -993,8 +986,8 @@ case 2: ;} break; - case 124: -#line 941 "perly.y" + case 122: +#line 937 "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),'('); @@ -1002,8 +995,8 @@ case 2: ;} break; - case 125: -#line 947 "perly.y" + case 123: +#line 943 "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),')'); @@ -1012,16 +1005,16 @@ case 2: ;} break; - case 126: -#line 954 "perly.y" + case 124: +#line 950 "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),']'); ;} break; - case 127: -#line 959 "perly.y" + case 125: +#line 955 "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),')'); @@ -1030,22 +1023,22 @@ case 2: ;} break; - case 128: -#line 969 "perly.y" + case 126: +#line 965 "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 129: -#line 973 "perly.y" + case 127: +#line 969 "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 130: -#line 977 "perly.y" + case 128: +#line 973 "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))); @@ -1053,50 +1046,50 @@ case 2: ;} break; - case 131: + case 129: +#line 979 "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 130: #line 983 "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 132: + case 131: #line 987 "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 133: + case 132: #line 991 "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 134: + case 133: #line 995 "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 135: + case 134: #line 999 "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 136: + case 135: #line 1003 "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 137: -#line 1007 "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({ @@ -1110,29 +1103,29 @@ case 2: ;} break; - case 138: -#line 1019 "perly.y" + case 136: +#line 1015 "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 139: -#line 1023 "perly.y" + case 137: +#line 1019 "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 140: -#line 1027 "perly.y" + case 138: +#line 1023 "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 141: -#line 1031 "perly.y" + case 139: +#line 1027 "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 @@ -1141,15 +1134,15 @@ case 2: ;} break; - case 142: -#line 1041 "perly.y" + case 140: +#line 1037 "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 143: -#line 1045 "perly.y" + case 141: +#line 1041 "perly.y" { (yyval.opval) = IF_MAD( newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)), (ps[(2) - (2)].val.opval) @@ -1158,70 +1151,70 @@ case 2: ;} break; - case 144: -#line 1052 "perly.y" + case 142: +#line 1048 "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 145: -#line 1056 "perly.y" + case 143: +#line 1052 "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 146: -#line 1060 "perly.y" + case 144: +#line 1056 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 147: -#line 1065 "perly.y" + case 145: +#line 1061 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 148: -#line 1070 "perly.y" + case 146: +#line 1066 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, mod(scalar((ps[(2) - (2)].val.opval)), OP_PREINC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 149: -#line 1075 "perly.y" + case 147: +#line 1071 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, mod(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 150: -#line 1084 "perly.y" + case 148: +#line 1080 "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),']'); ;} break; - case 151: -#line 1089 "perly.y" + case 149: +#line 1085 "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),']'); ;} break; - case 152: -#line 1094 "perly.y" + case 150: +#line 1090 "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),';'); @@ -1229,8 +1222,8 @@ case 2: ;} break; - case 153: -#line 1100 "perly.y" + case 151: +#line 1096 "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),';'); @@ -1238,8 +1231,8 @@ case 2: ;} break; - case 154: -#line 1106 "perly.y" + case 152: +#line 1102 "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'); @@ -1248,22 +1241,22 @@ case 2: ;} break; - case 155: -#line 1117 "perly.y" + case 153: +#line 1113 "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 156: -#line 1121 "perly.y" + case 154: +#line 1117 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D'); ;} break; - case 157: -#line 1125 "perly.y" + case 155: +#line 1121 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, @@ -1277,8 +1270,8 @@ case 2: ;} break; - case 158: -#line 1137 "perly.y" + case 156: +#line 1133 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_append_elem(OP_LIST, @@ -1293,8 +1286,8 @@ case 2: ;} break; - case 159: -#line 1150 "perly.y" + case 157: +#line 1146 "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(); @@ -1304,8 +1297,8 @@ case 2: ;} break; - case 160: -#line 1158 "perly.y" + case 158: +#line 1154 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), @@ -1316,54 +1309,64 @@ case 2: ;} break; - case 165: -#line 1174 "perly.y" + case 163: +#line 1170 "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),':'); ;} break; - case 166: -#line 1179 "perly.y" + case 164: +#line 1175 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((ps[(2) - (2)].val.opval),OP_REFGEN)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 167: -#line 1183 "perly.y" + case 165: +#line 1179 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 168: -#line 1185 "perly.y" + case 166: +#line 1181 "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 169: -#line 1189 "perly.y" + case 167: +#line 1185 "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),')'); ;} break; - case 170: -#line 1194 "perly.y" + case 168: +#line 1190 "perly.y" { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;} break; - case 171: -#line 1196 "perly.y" + case 169: +#line 1192 "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),')'); ;} break; + case 170: +#line 1197 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + + case 171: +#line 1199 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + case 172: #line 1201 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} @@ -1376,7 +1379,7 @@ case 2: case 174: #line 1205 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;} break; case 175: @@ -1386,16 +1389,6 @@ case 2: case 176: #line 1209 "perly.y" - { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;} - break; - - case 177: -#line 1211 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} - break; - - case 178: -#line 1213 "perly.y" { (yyval.opval) = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1406,8 +1399,8 @@ case 2: ;} break; - case 179: -#line 1222 "perly.y" + case 177: +#line 1218 "perly.y" { (yyval.opval) = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1420,26 +1413,26 @@ case 2: ;} break; - case 180: -#line 1233 "perly.y" + case 178: +#line 1229 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 181: -#line 1235 "perly.y" + case 179: +#line 1231 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 182: -#line 1237 "perly.y" + case 180: +#line 1233 "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),')'); ;} break; - case 183: -#line 1242 "perly.y" + case 181: +#line 1238 "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)))); @@ -1454,91 +1447,91 @@ case 2: ;} break; - case 184: -#line 1255 "perly.y" + case 182: +#line 1251 "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'); ;} break; - case 185: -#line 1260 "perly.y" + case 183: +#line 1256 "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'); ;} break; - case 186: -#line 1265 "perly.y" + case 184: +#line 1261 "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 187: -#line 1269 "perly.y" + case 185: +#line 1265 "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 188: -#line 1273 "perly.y" + case 186: +#line 1269 "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 189: -#line 1277 "perly.y" + case 187: +#line 1273 "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 190: -#line 1281 "perly.y" + case 188: +#line 1277 "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 191: -#line 1285 "perly.y" + case 189: +#line 1281 "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 192: -#line 1289 "perly.y" + case 190: +#line 1285 "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 193: -#line 1293 "perly.y" + case 191: +#line 1289 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 194: -#line 1295 "perly.y" + case 192: +#line 1291 "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 195: -#line 1298 "perly.y" + case 193: +#line 1294 "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 196: -#line 1302 "perly.y" + case 194: +#line 1298 "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),'('); @@ -1546,14 +1539,14 @@ case 2: ;} break; - case 197: -#line 1308 "perly.y" + case 195: +#line 1304 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 198: -#line 1311 "perly.y" + case 196: +#line 1307 "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); @@ -1564,8 +1557,8 @@ case 2: ;} break; - case 199: -#line 1320 "perly.y" + case 197: +#line 1316 "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),'('); @@ -1573,16 +1566,16 @@ case 2: ;} break; - case 200: -#line 1326 "perly.y" + case 198: +#line 1322 "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),')'); ;} break; - case 203: -#line 1333 "perly.y" + case 201: +#line 1329 "perly.y" { (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); @@ -1590,8 +1583,8 @@ case 2: ;} break; - case 205: -#line 1343 "perly.y" + case 203: +#line 1339 "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'); @@ -1601,143 +1594,143 @@ case 2: ;} break; - case 206: -#line 1351 "perly.y" + case 204: +#line 1347 "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 207: -#line 1358 "perly.y" + case 205: +#line 1354 "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),')'); ;} break; - case 208: -#line 1363 "perly.y" + case 206: +#line 1359 "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),')'); ;} break; + case 207: +#line 1364 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + + case 208: +#line 1366 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + case 209: #line 1368 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 210: -#line 1370 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} +#line 1373 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; case 211: -#line 1372 "perly.y" +#line 1375 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 212: -#line 1377 "perly.y" +#line 1379 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 213: -#line 1379 "perly.y" +#line 1381 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 214: -#line 1383 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} +#line 1385 "perly.y" + { (yyval.i_tkval) = (ps[(1) - (1)].val.i_tkval); ;} break; case 215: -#line 1385 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} +#line 1387 "perly.y" + { munge_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;} break; case 216: #line 1389 "perly.y" - { (yyval.i_tkval) = (ps[(1) - (1)].val.i_tkval); ;} + { (yyval.i_tkval) = (ps[(3) - (3)].val.i_tkval); ;} break; case 217: -#line 1391 "perly.y" - { munge_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;} +#line 1395 "perly.y" + { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} break; case 218: -#line 1393 "perly.y" - { (yyval.i_tkval) = (ps[(3) - (3)].val.i_tkval); ;} - break; - - case 219: #line 1399 "perly.y" - { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} - break; - - case 220: -#line 1403 "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 221: -#line 1409 "perly.y" + case 219: +#line 1405 "perly.y" { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$'); ;} break; - case 222: -#line 1415 "perly.y" + case 220: +#line 1411 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@'); ;} break; - case 223: -#line 1421 "perly.y" + case 221: +#line 1417 "perly.y" { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%'); ;} break; - case 224: -#line 1427 "perly.y" + case 222: +#line 1423 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l'); ;} break; - case 225: -#line 1433 "perly.y" + case 223: +#line 1429 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*'); ;} break; - case 226: -#line 1440 "perly.y" + case 224: +#line 1436 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 227: -#line 1442 "perly.y" + case 225: +#line 1438 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 228: -#line 1444 "perly.y" + case 226: +#line 1440 "perly.y" { (yyval.opval) = scope((ps[(1) - (1)].val.opval)); ;} break; - case 229: -#line 1447 "perly.y" + case 227: +#line 1443 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; diff --git a/perly.h b/perly.h index b3a5595..5c1bd95 100644 --- a/perly.h +++ b/perly.h @@ -219,7 +219,7 @@ typedef union YYSTYPE TOKEN* tkval; #endif } -/* Line 1529 of yacc.c. */ +/* Line 1489 of yacc.c. */ YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 diff --git a/perly.tab b/perly.tab index 6b3a73b..236e681 100644 --- a/perly.tab +++ b/perly.tab @@ -1,15 +1,15 @@ #define YYFINAL 11 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2121 +#define YYLAST 2143 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 98 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 74 +#define YYNNTS 73 /* YYNRULES -- Number of rules. */ -#define YYNRULES 229 +#define YYNRULES 227 /* YYNRULES -- Number of states. */ -#define YYNSTATES 451 +#define YYNSTATES 449 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -64,27 +64,27 @@ static const yytype_uint16 yyprhs[] = { 0, 0, 3, 6, 7, 11, 12, 16, 17, 21, 24, 29, 30, 31, 32, 37, 38, 39, 42, 45, - 47, 49, 52, 54, 56, 59, 62, 66, 68, 71, - 73, 75, 79, 83, 87, 91, 95, 99, 100, 103, - 110, 118, 126, 133, 136, 137, 140, 150, 160, 171, - 181, 190, 203, 207, 216, 217, 218, 220, 221, 223, - 225, 227, 229, 231, 232, 234, 236, 238, 240, 242, - 244, 246, 248, 253, 255, 256, 263, 270, 271, 272, - 273, 275, 276, 278, 279, 282, 284, 287, 289, 291, - 293, 298, 299, 308, 309, 317, 321, 325, 329, 331, - 334, 338, 340, 344, 350, 357, 361, 365, 371, 374, - 379, 380, 386, 388, 390, 396, 401, 407, 412, 418, - 425, 431, 436, 442, 447, 451, 458, 463, 469, 473, - 477, 481, 485, 489, 493, 497, 501, 505, 509, 513, - 517, 521, 525, 528, 531, 534, 537, 540, 543, 546, - 549, 553, 556, 561, 565, 571, 574, 577, 582, 588, - 593, 599, 601, 603, 605, 607, 613, 616, 618, 621, - 625, 627, 630, 632, 634, 636, 638, 640, 642, 647, - 653, 655, 657, 661, 666, 670, 672, 675, 678, 680, - 683, 686, 688, 691, 693, 696, 698, 702, 704, 708, - 713, 718, 720, 722, 724, 726, 730, 733, 737, 740, - 742, 744, 746, 747, 749, 750, 752, 754, 755, 759, - 761, 764, 767, 770, 773, 776, 779, 781, 783, 785 + 47, 49, 52, 55, 59, 62, 65, 68, 70, 72, + 76, 80, 84, 88, 92, 96, 97, 100, 107, 115, + 123, 130, 133, 134, 137, 147, 157, 168, 178, 187, + 200, 204, 213, 214, 215, 217, 218, 220, 222, 224, + 226, 228, 229, 231, 233, 235, 237, 239, 241, 243, + 245, 250, 252, 253, 260, 267, 268, 269, 270, 272, + 273, 275, 276, 279, 281, 284, 286, 288, 290, 295, + 296, 305, 306, 314, 318, 322, 326, 328, 331, 335, + 337, 341, 347, 354, 358, 362, 368, 371, 376, 377, + 383, 385, 387, 393, 398, 404, 409, 415, 422, 428, + 433, 439, 444, 448, 455, 460, 466, 470, 474, 478, + 482, 486, 490, 494, 498, 502, 506, 510, 514, 518, + 522, 525, 528, 531, 534, 537, 540, 543, 546, 550, + 553, 558, 562, 568, 571, 574, 579, 585, 590, 596, + 598, 600, 602, 604, 610, 613, 615, 618, 622, 624, + 627, 629, 631, 633, 635, 637, 639, 644, 650, 652, + 654, 658, 663, 667, 669, 672, 675, 677, 680, 683, + 685, 688, 690, 693, 695, 699, 701, 705, 710, 715, + 717, 719, 721, 723, 727, 730, 734, 737, 739, 741, + 743, 744, 746, 747, 749, 751, 752, 756, 758, 761, + 764, 767, 770, 773, 776, 778, 780, 782 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -94,109 +94,109 @@ static const yytype_int16 yyrhs[] = -1, -1, 5, 101, 111, -1, -1, 6, 102, 110, -1, 107, 110, -1, 7, 105, 110, 8, -1, -1, -1, -1, 7, 109, 110, 8, -1, -1, -1, 110, - 128, -1, 110, 112, -1, 128, -1, 112, -1, 127, - 115, -1, 118, -1, 119, -1, 127, 116, -1, 127, - 18, -1, 127, 113, 18, -1, 143, -1, 127, 30, - -1, 1, -1, 147, -1, 147, 39, 147, -1, 147, - 40, 147, -1, 147, 37, 147, -1, 147, 38, 123, - -1, 147, 44, 147, -1, 147, 46, 147, -1, -1, - 41, 108, -1, 42, 162, 124, 95, 108, 114, -1, - 39, 162, 105, 124, 95, 108, 114, -1, 40, 162, - 105, 126, 95, 108, 114, -1, 46, 162, 105, 124, - 95, 108, -1, 47, 104, -1, -1, 43, 104, -1, - 127, 37, 162, 105, 122, 95, 120, 108, 117, -1, - 127, 38, 162, 105, 123, 95, 120, 108, 117, -1, **** PATCH TRUNCATED AT 2000 LINES -- 1680 NOT SHOWN **** -- Perl5 Master Repository
