In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/8c74b41425572faeb638f1269025b59d0785794f?hp=919ec23b10e41ed5c6aaf77a8ae3d2f7ef279f1b>
- Log ----------------------------------------------------------------- commit 8c74b41425572faeb638f1269025b59d0785794f Author: Dagfinn Ilmari Mannsåker <[email protected]> Date: Thu Jun 27 16:48:36 2013 +0100 Remove support for "do SUBROUTINE(LIST)" It's been deprecated (and emitting a warning) since Perl v5.0.0, and support for it consitutes nearly 3% of the grammar. ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 - perly.act | 785 ++++++++++++++---------------- perly.c | 3 - perly.h | 64 ++- perly.tab | 1316 ++++++++++++++++++++++++-------------------------- perly.y | 43 -- pod/perldelta.pod | 5 + pod/perlfunc.pod | 6 - t/lib/warnings/perly | 30 -- t/op/do.t | 66 +-- t/op/lexsub.t | 31 +- 11 files changed, 1047 insertions(+), 1303 deletions(-) delete mode 100644 t/lib/warnings/perly diff --git a/MANIFEST b/MANIFEST index efdc69a..23fa143 100644 --- a/MANIFEST +++ b/MANIFEST @@ -4976,7 +4976,6 @@ t/lib/warnings/op Tests for op.c for warnings.t t/lib/warnings/pad Tests for pad.c for warnings.t t/lib/warnings/perl Tests for perl.c for warnings.t t/lib/warnings/perlio Tests for perlio.c for warnings.t -t/lib/warnings/perly Tests for perly.y for warnings.t t/lib/warnings/pp Tests for pp.c for warnings.t t/lib/warnings/pp_ctl Tests for pp_ctl.c for warnings.t t/lib/warnings/pp_hot Tests for pp_hot.c for warnings.t diff --git a/perly.act b/perly.act index ec9fe92..d261d06 100644 --- a/perly.act +++ b/perly.act @@ -8,7 +8,7 @@ case 2: #line 142 "perly.y" { PL_parser->expect = XSTATE; - ;} + } break; case 3: @@ -16,14 +16,14 @@ case 2: { newPROG(block_end((ps[(3) - (4)].val.ival),(ps[(4) - (4)].val.opval))); (yyval.ival) = 0; - ;} + } break; case 4: #line 151 "perly.y" { parser->expect = XTERM; - ;} + } break; case 5: @@ -31,14 +31,14 @@ case 2: { PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; - ;} + } break; case 6: #line 160 "perly.y" { parser->expect = XBLOCK; - ;} + } break; case 7: @@ -49,14 +49,14 @@ case 2: (yyval.ival) = 0; yyunlex(); parser->yychar = YYEOF; - ;} + } break; case 8: #line 172 "perly.y" { parser->expect = XSTATE; - ;} + } break; case 9: @@ -67,14 +67,14 @@ case 2: (yyval.ival) = 0; yyunlex(); parser->yychar = YYEOF; - ;} + } break; case 10: #line 184 "perly.y" { parser->expect = XSTATE; - ;} + } break; case 11: @@ -85,14 +85,14 @@ case 2: (yyval.ival) = 0; yyunlex(); parser->yychar = YYEOF; - ;} + } break; case 12: #line 196 "perly.y" { parser->expect = XSTATE; - ;} + } break; case 13: @@ -100,7 +100,7 @@ case 2: { PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; - ;} + } break; case 14: @@ -110,7 +110,7 @@ case 2: (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 15: @@ -120,12 +120,12 @@ case 2: (yyval.opval) = block_end((ps[(2) - (7)].val.ival), (ps[(5) - (7)].val.opval)); TOKEN_GETMAD((ps[(1) - (7)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(7) - (7)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 16: #line 227 "perly.y" - { (yyval.ival) = block_start(TRUE); ;} + { (yyval.ival) = block_start(TRUE); } break; case 17: @@ -135,17 +135,17 @@ case 2: (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 18: #line 240 "perly.y" - { (yyval.ival) = block_start(FALSE); ;} + { (yyval.ival) = block_start(FALSE); } break; case 19: #line 245 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 20: @@ -154,12 +154,12 @@ case 2: PL_pad_reset_pending = TRUE; if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval)) PL_hints |= HINT_BLOCK_SCOPE; - ;} + } break; case 21: #line 256 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 22: @@ -168,7 +168,7 @@ case 2: PL_pad_reset_pending = TRUE; if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval)) PL_hints |= HINT_BLOCK_SCOPE; - ;} + } break; case 23: @@ -179,12 +179,12 @@ case 2: } else { (yyval.opval) = IF_MAD(newOP(OP_NULL, 0), NULL); } - ;} + } break; case 24: #line 275 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; case 25: @@ -195,7 +195,7 @@ case 2: PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval), (ps[(2) - (2)].val.opval) ? cLISTOPx((yyval.opval))->op_first : (yyval.opval), 'L'); - ;} + } break; case 26: @@ -205,12 +205,12 @@ case 2: * PVAL((ps[(1) - (2)].val.p_tkval))[strlen(PVAL((ps[(1) - (2)].val.p_tkval)))+1], 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'); - ;} + } break; case 27: #line 297 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; case 28: @@ -218,7 +218,7 @@ case 2: { (yyval.opval) = newOP(OP_NULL,0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p'); - ;} + } break; case 29: @@ -238,7 +238,7 @@ case 2: SvREFCNT_inc_simple_void(fmtcv); pad_add_anon(fmtcv, OP_NULL); } - ;} + } break; case 30: @@ -263,7 +263,7 @@ case 2: CvCLONE_on(PL_compcv); PL_parser->in_my = 0; PL_parser->in_my_stash = NULL; - ;} + } break; case 31: @@ -294,7 +294,7 @@ case 2: (yyval.opval) = (OP*)NULL; #endif intro_my(); - ;} + } break; case 32: @@ -312,12 +312,12 @@ case 2: package_version((ps[(2) - (4)].val.opval)); (yyval.opval) = (OP*)NULL; #endif - ;} + } break; case 33: #line 386 "perly.y" - { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} + { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } break; case 34: @@ -335,7 +335,7 @@ case 2: 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)); (yyval.opval) = (OP*)NULL; #endif - ;} + } break; case 35: @@ -347,7 +347,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (7)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (7)].val.i_tkval),(yyval.opval),')'); PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); - ;} + } break; case 36: @@ -359,7 +359,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (7)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (7)].val.i_tkval),(yyval.opval),')'); PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); - ;} + } break; case 37: @@ -373,17 +373,17 @@ case 2: ? 0 : offset)); PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval)); - ;} + } break; case 38: #line 432 "perly.y" - { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;} + { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); } break; case 39: #line 434 "perly.y" - { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;} + { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); } break; case 40: @@ -396,7 +396,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (8)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (8)].val.i_tkval),(yyval.opval),')'); PL_parser->copline = (line_t)IVAL((ps[(1) - (8)].val.i_tkval)); - ;} + } break; case 41: @@ -409,7 +409,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (8)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (8)].val.i_tkval),(yyval.opval),')'); PL_parser->copline = (line_t)IVAL((ps[(1) - (8)].val.i_tkval)); - ;} + } break; case 42: @@ -432,7 +432,7 @@ case 2: TOKEN_GETMAD((ps[(7) - (11)].val.i_tkval),(yyval.opval),'2'); TOKEN_GETMAD((ps[(10) - (11)].val.i_tkval),(yyval.opval),')'); PL_parser->copline = (line_t)IVAL((ps[(1) - (11)].val.i_tkval)); - ;} + } break; case 43: @@ -444,7 +444,7 @@ case 2: TOKEN_GETMAD((ps[(5) - (9)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(7) - (9)].val.i_tkval),(yyval.opval),')'); PL_parser->copline = (line_t)IVAL((ps[(1) - (9)].val.i_tkval)); - ;} + } break; case 44: @@ -456,7 +456,7 @@ case 2: TOKEN_GETMAD((ps[(3) - (8)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(6) - (8)].val.i_tkval),(yyval.opval),')'); PL_parser->copline = (line_t)IVAL((ps[(1) - (8)].val.i_tkval)); - ;} + } break; case 45: @@ -468,7 +468,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (7)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (7)].val.i_tkval),(yyval.opval),')'); PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); - ;} + } break; case 46: @@ -477,7 +477,7 @@ case 2: /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, (OP*)NULL, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval), 0); - ;} + } break; case 47: @@ -487,7 +487,7 @@ case 2: if ((ps[(2) - (5)].val.opval)) { package_version((ps[(2) - (5)].val.opval)); } - ;} + } break; case 48: @@ -500,7 +500,7 @@ case 2: TOKEN_GETMAD((ps[(8) - (8)].val.i_tkval),(yyval.opval),'}'); 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)); - ;} + } break; case 49: @@ -509,7 +509,7 @@ case 2: PL_parser->expect = XSTATE; (yyval.opval) = (ps[(1) - (2)].val.opval); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),';'); - ;} + } break; case 50: @@ -519,7 +519,7 @@ case 2: (yyval.opval) = IF_MAD(newOP(OP_NULL, 0), (OP*)NULL); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),';'); PL_parser->copline = NOLINE; - ;} + } break; case 51: @@ -543,55 +543,55 @@ case 2: else PL_parser->copline--; (yyval.opval) = newSTATEOP(0, NULL, convert(OP_FORMLINE, 0, list)); - ;} + } break; case 52: #line 566 "perly.y" - { (yyval.opval) = NULL; ;} + { (yyval.opval) = NULL; } break; case 53: #line 568 "perly.y" - { (yyval.opval) = op_unscope((ps[(2) - (3)].val.opval)); ;} + { (yyval.opval) = op_unscope((ps[(2) - (3)].val.opval)); } break; case 54: #line 573 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 55: #line 575 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; case 56: #line 577 "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 57: #line 581 "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 58: #line 585 "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 59: #line 589 "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 60: @@ -599,17 +599,17 @@ case 2: { (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)); - ;} + } break; case 61: #line 598 "perly.y" - { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;} + { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); } break; case 62: #line 603 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 63: @@ -618,7 +618,7 @@ case 2: ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); - ;} + } break; case 64: @@ -631,12 +631,12 @@ case 2: TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'I'); TOKEN_GETMAD((ps[(2) - (6)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),')'); - ;} + } break; case 65: #line 624 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 66: @@ -644,91 +644,91 @@ case 2: { (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); - ;} + } break; case 67: #line 634 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); - intro_my(); ;} + intro_my(); } break; case 68: #line 640 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 70: #line 646 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); - (yyval.opval) = tmplval.opval; ;} + (yyval.opval) = tmplval.opval; } break; case 72: #line 654 "perly.y" - { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} + { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); } break; case 73: #line 659 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} + { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); } break; case 74: #line 663 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} + { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); } break; case 75: #line 667 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} + { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); } break; case 76: #line 670 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; case 77: #line 671 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 78: #line 675 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); - SAVEFREESV(PL_compcv); ;} + SAVEFREESV(PL_compcv); } break; case 79: #line 681 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); - SAVEFREESV(PL_compcv); ;} + SAVEFREESV(PL_compcv); } break; case 80: #line 686 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); - SAVEFREESV(PL_compcv); ;} + SAVEFREESV(PL_compcv); } break; case 83: #line 697 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 85: #line 703 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + { (yyval.opval) = (OP*)NULL; } break; case 86: #line 705 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); - ;} + } break; case 87: @@ -738,14 +738,14 @@ case 2: (OP*)NULL ); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':'); - ;} + } break; case 88: #line 719 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); - ;} + } break; case 89: @@ -755,12 +755,12 @@ case 2: (OP*)NULL ); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':'); - ;} + } break; case 90: #line 732 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; case 91: @@ -771,28 +771,28 @@ case 2: ); PL_parser->expect = XSTATE; TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),';'); - ;} + } break; case 92: #line 744 "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 93: #line 748 "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 94: #line 752 "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 96: @@ -805,7 +805,7 @@ case 2: #else (yyval.opval) = (ps[(1) - (2)].val.opval); #endif - ;} + } break; case 97: @@ -817,7 +817,7 @@ case 2: token_getmad((ps[(2) - (3)].val.i_tkval),term,','); ) (yyval.opval) = op_append_elem(OP_LIST, (ps[(1) - (3)].val.opval), term); - ;} + } break; case 99: @@ -825,7 +825,7 @@ case 2: { (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 100: @@ -835,7 +835,7 @@ case 2: TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')'); - ;} + } break; case 101: @@ -847,7 +847,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (6)].val.i_tkval),(yyval.opval),'A'); TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),')'); - ;} + } break; case 102: @@ -856,7 +856,7 @@ case 2: op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)), newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval)))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'A'); - ;} + } break; case 103: @@ -865,7 +865,7 @@ case 2: op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)), newUNOP(OP_METHOD, 0, (ps[(1) - (3)].val.opval)))); - ;} + } break; case 104: @@ -876,14 +876,14 @@ case 2: newUNOP(OP_METHOD, 0, (ps[(1) - (5)].val.opval)))); TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')'); - ;} + } break; case 105: #line 824 "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 106: @@ -892,13 +892,13 @@ case 2: TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); - ;} + } break; case 107: #line 834 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); - (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;} + (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); } break; case 108: @@ -906,7 +906,7 @@ case 2: { (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 111: @@ -916,7 +916,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 112: @@ -924,7 +924,7 @@ case 2: { (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 113: @@ -935,7 +935,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'a'); TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),']'); - ;} + } break; case 114: @@ -945,7 +945,7 @@ case 2: 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 115: @@ -955,7 +955,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 116: @@ -968,7 +968,7 @@ case 2: TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(5) - (6)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 117: @@ -980,7 +980,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 118: @@ -990,7 +990,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'a'); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); - ;} + } break; case 119: @@ -1001,7 +1001,7 @@ case 2: TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'a'); TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')'); - ;} + } break; case 120: @@ -1011,7 +1011,7 @@ case 2: newCVREF(0, scalar((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 121: @@ -1020,7 +1020,7 @@ case 2: newCVREF(0, 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 122: @@ -1030,7 +1030,7 @@ case 2: TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),')'); TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),']'); - ;} + } break; case 123: @@ -1038,7 +1038,7 @@ case 2: { (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 124: @@ -1048,21 +1048,21 @@ case 2: TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')'); TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),']'); - ;} + } break; case 125: #line 956 "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 126: #line 960 "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: @@ -1071,49 +1071,49 @@ case 2: 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))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); - ;} + } break; case 128: #line 970 "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 129: #line 974 "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 978 "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 131: #line 982 "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: #line 986 "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: #line 990 "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: @@ -1128,28 +1128,28 @@ case 2: op = (UNOP*)op->op_first; /* get to range */ token_getmad((ps[(2) - (3)].val.i_tkval),(OP*)op,'o'); }); - ;} + } break; case 135: #line 1006 "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 136: #line 1010 "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 137: #line 1014 "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 138: @@ -1159,14 +1159,14 @@ case 2: ((yyval.opval)->op_type == OP_NOT ? ((UNOP*)(yyval.opval))->op_first : (yyval.opval)), '~'); - ;} + } break; case 139: #line 1028 "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 140: @@ -1176,21 +1176,21 @@ case 2: (ps[(2) - (2)].val.opval) ); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'+'); - ;} + } break; case 141: #line 1039 "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 142: #line 1043 "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 143: @@ -1198,7 +1198,7 @@ case 2: { (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'); - ;} + } break; case 144: @@ -1206,7 +1206,7 @@ case 2: { (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'); - ;} + } break; case 145: @@ -1221,7 +1221,7 @@ case 2: (ps[(1) - (2)].val.opval) )); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); - ;} + } break; case 146: @@ -1229,7 +1229,7 @@ case 2: { (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'); - ;} + } break; case 147: @@ -1237,7 +1237,7 @@ case 2: { (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'); - ;} + } break; case 148: @@ -1245,7 +1245,7 @@ case 2: { (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 149: @@ -1253,7 +1253,7 @@ case 2: { (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 150: @@ -1262,7 +1262,7 @@ case 2: TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 151: @@ -1271,7 +1271,7 @@ case 2: TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; case 152: @@ -1281,157 +1281,103 @@ case 2: TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); OP_GETMAD((ps[(3) - (5)].val.opval),(yyval.opval),'s'); OP_GETMAD((ps[(4) - (5)].val.opval),(yyval.opval),'a'); - ;} + } break; case 153: #line 1116 "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 154: #line 1120 "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 155: -#line 1124 "perly.y" - { (yyval.opval) = newUNOP(OP_ENTERSUB, - OPf_SPECIAL|OPf_STACKED, - op_prepend_elem(OP_LIST, - scalar(newCVREF( - (OPpENTERSUB_AMPER<<8), - scalar((ps[(2) - (4)].val.opval)) - )),(OP*)NULL)); dep(); - TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); - TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'('); - TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); - ;} - break; - - case 156: -#line 1136 "perly.y" - { (yyval.opval) = newUNOP(OP_ENTERSUB, - OPf_SPECIAL|OPf_STACKED, - op_append_elem(OP_LIST, - (ps[(4) - (5)].val.opval), - scalar(newCVREF( - (OPpENTERSUB_AMPER<<8), - scalar((ps[(2) - (5)].val.opval)) - )))); dep(); - TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); - TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'('); - TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')'); - ;} - break; - - case 157: -#line 1149 "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(); - TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); - TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'('); - TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); - ;} + } break; - case 158: -#line 1157 "perly.y" - { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, - op_prepend_elem(OP_LIST, - (ps[(4) - (5)].val.opval), - scalar(newCVREF(0,scalar((ps[(2) - (5)].val.opval)))))); dep(); - TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); - TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'('); - TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')'); - ;} - break; - - case 163: -#line 1173 "perly.y" + case 159: +#line 1130 "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 164: -#line 1178 "perly.y" + case 160: +#line 1135 "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 165: -#line 1182 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 161: +#line 1139 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 166: -#line 1184 "perly.y" + case 162: +#line 1141 "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 167: -#line 1188 "perly.y" + case 163: +#line 1145 "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 168: -#line 1193 "perly.y" - { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;} + case 164: +#line 1150 "perly.y" + { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); } break; - case 169: -#line 1195 "perly.y" + case 165: +#line 1152 "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 1200 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 166: +#line 1157 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 171: -#line 1202 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 167: +#line 1159 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 172: -#line 1204 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 168: +#line 1161 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 173: -#line 1206 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 169: +#line 1163 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 174: -#line 1208 "perly.y" - { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;} + case 170: +#line 1165 "perly.y" + { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));} break; - case 175: -#line 1210 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 171: +#line 1167 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 176: -#line 1212 "perly.y" + case 172: +#line 1169 "perly.y" { (yyval.opval) = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1442,11 +1388,11 @@ case 2: (ps[(1) - (4)].val.opval)->op_private & OPpSLICEWARNING; TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); - ;} + } break; - case 177: -#line 1224 "perly.y" + case 173: +#line 1181 "perly.y" { (yyval.opval) = op_prepend_elem(OP_KVASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVASLICE, 0, @@ -1457,11 +1403,11 @@ case 2: (ps[(1) - (4)].val.opval)->op_private & OPpSLICEWARNING; TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); - ;} + } break; - case 178: -#line 1236 "perly.y" + case 174: +#line 1193 "perly.y" { (yyval.opval) = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1474,11 +1420,11 @@ case 2: TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; - case 179: -#line 1250 "perly.y" + case 175: +#line 1207 "perly.y" { (yyval.opval) = op_prepend_elem(OP_KVHSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVHSLICE, 0, @@ -1491,29 +1437,29 @@ case 2: TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}'); - ;} + } break; - case 180: -#line 1264 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 176: +#line 1221 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 181: -#line 1266 "perly.y" - { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;} + case 177: +#line 1223 "perly.y" + { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); } break; - case 182: -#line 1268 "perly.y" + case 178: +#line 1225 "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 1273 "perly.y" + case 179: +#line 1230 "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)))); @@ -1525,158 +1471,158 @@ case 2: token_getmad((ps[(2) - (4)].val.i_tkval),op,'('); token_getmad((ps[(4) - (4)].val.i_tkval),op,')'); }); - ;} + } break; - case 184: -#line 1286 "perly.y" + case 180: +#line 1243 "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 1291 "perly.y" + case 181: +#line 1248 "perly.y" { (yyval.opval) = newSVREF((ps[(1) - (4)].val.opval)); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'$'); - ;} + } break; - case 186: -#line 1295 "perly.y" + case 182: +#line 1252 "perly.y" { (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'@'); - ;} + } break; - case 187: -#line 1299 "perly.y" + case 183: +#line 1256 "perly.y" { (yyval.opval) = newHVREF((ps[(1) - (4)].val.opval)); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'%'); - ;} + } break; - case 188: -#line 1303 "perly.y" + case 184: +#line 1260 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar(newCVREF(IVAL((ps[(3) - (4)].val.i_tkval)),(ps[(1) - (4)].val.opval)))); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'&'); - ;} + } break; - case 189: -#line 1308 "perly.y" + case 185: +#line 1265 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(1) - (4)].val.opval)); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'*'); - ;} + } break; - case 190: -#line 1312 "perly.y" + case 186: +#line 1269 "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 191: -#line 1317 "perly.y" + case 187: +#line 1274 "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 192: -#line 1321 "perly.y" + case 188: +#line 1278 "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 193: -#line 1325 "perly.y" + case 189: +#line 1282 "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 194: -#line 1329 "perly.y" + case 190: +#line 1286 "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 195: -#line 1333 "perly.y" + case 191: +#line 1290 "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 196: -#line 1337 "perly.y" + case 192: +#line 1294 "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 197: -#line 1341 "perly.y" + case 193: +#line 1298 "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 198: -#line 1345 "perly.y" - { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} + case 194: +#line 1302 "perly.y" + { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); } break; - case 199: -#line 1347 "perly.y" + case 195: +#line 1304 "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)))); ;} + op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); } break; - case 200: -#line 1350 "perly.y" + case 196: +#line 1307 "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 201: -#line 1354 "perly.y" + case 197: +#line 1311 "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),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); - ;} + } break; - case 202: -#line 1360 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 198: +#line 1317 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 203: -#line 1362 "perly.y" + case 199: +#line 1319 "perly.y" { (yyval.opval) = (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 204: -#line 1367 "perly.y" + case 200: +#line 1324 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, - scalar((ps[(1) - (1)].val.opval))); ;} + scalar((ps[(1) - (1)].val.opval))); } break; - case 205: -#line 1370 "perly.y" + case 201: +#line 1327 "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); @@ -1684,20 +1630,20 @@ case 2: TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); - ;} + } break; - case 206: -#line 1379 "perly.y" + case 202: +#line 1336 "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),'('); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); - ;} + } break; - case 207: -#line 1385 "perly.y" + case 203: +#line 1342 "perly.y" { if ( (ps[(1) - (1)].val.opval)->op_type != OP_TRANS && (ps[(1) - (1)].val.opval)->op_type != OP_TRANSR @@ -1707,199 +1653,196 @@ case 2: SAVEFREESV(PL_compcv); } else (yyval.ival) = 0; - ;} + } break; - case 208: -#line 1396 "perly.y" + case 204: +#line 1353 "perly.y" { (yyval.opval) = pmruntime((ps[(1) - (5)].val.opval), (ps[(4) - (5)].val.opval), 1, (ps[(2) - (5)].val.ival)); TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')'); - ;} + } break; - case 211: -#line 1403 "perly.y" + case 207: +#line 1360 "perly.y" { (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'X'); - ;} + } break; - case 213: -#line 1413 "perly.y" + case 209: +#line 1370 "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'); append_madprops((ps[(3) - (3)].val.opval)->op_madprop, (yyval.opval), 'a'); (ps[(3) - (3)].val.opval)->op_madprop = 0; ); - ;} + } break; - case 214: -#line 1421 "perly.y" + case 210: +#line 1378 "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 215: -#line 1428 "perly.y" + case 211: +#line 1385 "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 216: -#line 1433 "perly.y" + case 212: +#line 1390 "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 217: -#line 1438 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 213: +#line 1395 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 218: -#line 1440 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 214: +#line 1397 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 219: -#line 1442 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 215: +#line 1399 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 220: -#line 1447 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + case 216: +#line 1404 "perly.y" + { (yyval.opval) = (OP*)NULL; } break; - case 221: -#line 1449 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 217: +#line 1406 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 222: -#line 1453 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} + case 218: +#line 1410 "perly.y" + { (yyval.opval) = (OP*)NULL; } break; - case 223: -#line 1455 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 219: +#line 1412 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - case 224: -#line 1461 "perly.y" - { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} + case 220: +#line 1418 "perly.y" + { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); } break; - case 225: -#line 1465 "perly.y" + case 221: +#line 1422 "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 226: -#line 1471 "perly.y" + case 222: +#line 1428 "perly.y" { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$'); - ;} + } break; - case 227: -#line 1477 "perly.y" + case 223: +#line 1434 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= IVAL((ps[(1) - (2)].val.i_tkval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@'); - ;} + } break; - case 228: -#line 1484 "perly.y" + case 224: +#line 1441 "perly.y" { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= IVAL((ps[(1) - (2)].val.i_tkval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%'); - ;} + } break; - case 229: -#line 1491 "perly.y" + case 225: +#line 1448 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l'); - ;} + } break; - case 230: -#line 1495 "perly.y" + case 226: +#line 1452 "perly.y" { (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'l'); - ;} + } break; - case 231: -#line 1501 "perly.y" + case 227: +#line 1458 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*'); - ;} + } break; - case 233: -#line 1508 "perly.y" + case 229: +#line 1465 "perly.y" { (yyval.opval) = newAVREF((ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),'@'); - ;} + } break; - case 235: -#line 1515 "perly.y" + case 231: +#line 1472 "perly.y" { (yyval.opval) = newHVREF((ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),'@'); - ;} + } break; - case 237: -#line 1522 "perly.y" + case 233: +#line 1479 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),'*'); - ;} + } break; - case 238: -#line 1529 "perly.y" - { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} + case 234: +#line 1486 "perly.y" + { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); } break; - case 239: -#line 1531 "perly.y" - { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} + case 235: +#line 1488 "perly.y" + { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); } break; - case 240: -#line 1533 "perly.y" - { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;} + case 236: +#line 1490 "perly.y" + { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); } break; - case 241: -#line 1536 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + case 237: +#line 1493 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); } break; - -/* Line 1267 of yacc.c. */ - default: break; /* Generated from: - * 570608a8d9575266e34e16588de5993f72c5756a88dcb273ffba0705beed3d8b perly.y + * 911fbbcab275e0f9645397ee5b80a7c2384e6b24f793c15e6d6e918ebfd4e384 perly.y * 5c9d2a0262457fe9b70073fc8ad6c188f812f38ad57712b7e2f53daa01b297cc regen_perly.pl * ex: set ro: */ diff --git a/perly.c b/perly.c index 5a934dc..d8eedf2 100644 --- a/perly.c +++ b/perly.c @@ -433,9 +433,6 @@ Perl_yyparse (pTHX_ int gramtype) **** PATCH TRUNCATED AT 2000 LINES -- 2023 NOT SHOWN **** -- Perl5 Master Repository
