In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/09f8a1025e8fc99cd5cd3e8fb446079c5725e43c?hp=714d51e0fd9f41e557209b93545e7e006dbc309c>
- Log ----------------------------------------------------------------- commit 09f8a1025e8fc99cd5cd3e8fb446079c5725e43c Author: Father Chrysostomos <[email protected]> Date: Fri Dec 5 22:44:56 2014 -0800 Remove comp/opsubs.t from deparse-skips.txt It passes. Since when I donât know. M Porting/deparse-skips.txt commit d62ccd9d1f7736b995b8c1a82a85b90a24c75dcd Author: Father Chrysostomos <[email protected]> Date: Fri Dec 5 22:43:40 2014 -0800 Remove comp/hints.t from deparse-skips.txt It passes, probably due to BEGIN block fixes. M Porting/deparse-skips.txt commit b987188d95df898b21c14cf21138b70cea5d11fc Author: Father Chrysostomos <[email protected]> Date: Fri Dec 5 22:41:49 2014 -0800 deparse-skips.txt: Note some skip reasons M Porting/deparse-skips.txt commit 5b2cf7d50391d1becfe45faeb8889e4e4343f2a7 Author: Father Chrysostomos <[email protected]> Date: Fri Dec 5 22:40:15 2014 -0800 Remove comp/form_scope.t from deparse-skips.txt It passes! M Porting/deparse-skips.txt commit 8b9fb2f9f022bfdeca1048b3797b844142826a9c Author: Father Chrysostomos <[email protected]> Date: Fri Dec 5 21:41:30 2014 -0800 Deparse formats in the right spot Formats need the same logic applied in 34b54951568, to avoid this: Input: { my $x; format STDOUT = @ $x . } __END__ $ pbpaste|./perl -Ilib -MO=Deparse { my $x; } format STDOUT = @ $x . __DATA__ - syntax OK That $x in the format is now global, not lexical. Also, we need to make sure the sequence numbers are correct. The statement after the format stopped having a higher sequence number than CvOUTSIDE_SEQ(format) in 8635e3c238f, because the âpendingâ sequence number set aside for the nextstate op created just after com- pile-time block exit (which nextstate op comes before the block) was not actually being used by newFORM (unlike newATTRSUB), so the follow- ing statement was using that number. M lib/B/Deparse.t M op.c M perly.act M perly.h M perly.tab M perly.y commit 6436970cde5c8aac6df90c1710576d85946042e4 Author: Father Chrysostomos <[email protected]> Date: Fri Dec 5 21:45:10 2014 -0800 Avoid extraneous â();â when deparsing just subs 34b54951 caused a program that is empty apart from sub definitions to be deparsed with â();â for the main sub. Previously it was omitted. This commit removes it, not only for the sake of backward-compatibil- ity, but also because â();â is not a particularly sane way of dumping an empty program. M lib/B/Deparse.pm M lib/B/Deparse.t ----------------------------------------------------------------------- Summary of changes: Porting/deparse-skips.txt | 9 +- lib/B/Deparse.pm | 21 ++- lib/B/Deparse.t | 18 ++- op.c | 1 + perly.act | 399 +++++++++++++++++++++++----------------------- perly.h | 2 +- perly.tab | 50 +++--- perly.y | 1 + 8 files changed, 264 insertions(+), 237 deletions(-) diff --git a/Porting/deparse-skips.txt b/Porting/deparse-skips.txt index 82071f2..7b1cf16 100644 --- a/Porting/deparse-skips.txt +++ b/Porting/deparse-skips.txt @@ -389,12 +389,9 @@ __DEPARSE_FAILURES__ ../lib/overload.t ../lib/overloading.t ../lib/utf8.t -base/lex.t -comp/final_line_num.t -comp/fold.t -comp/form_scope.t -comp/hints.t -comp/opsubs.t +base/lex.t # checks regexp stringification +comp/final_line_num.t # tests syntax error after BEGIN block +comp/fold.t # mutability of folded constants comp/parser.t comp/proto.t comp/require.t diff --git a/lib/B/Deparse.pm b/lib/B/Deparse.pm index a7dac05..2b2ee12 100644 --- a/lib/B/Deparse.pm +++ b/lib/B/Deparse.pm @@ -890,8 +890,25 @@ sub compile { local $B::overlay = {}; unless (null $root) { $self->pad_subs($self->{'curcv'}); - $self->pessimise($root, main_start); - print $self->indent($self->deparse_root($root)), "\n"; + # Check for a stub-followed-by-ex-cop, resulting from a program + # consisting solely of sub declarations. For backward-compati- + # bility (and sane output) we donât want to emit the stub. + # leave + # enter + # stub + # ex-nextstate (or ex-dbstate) + my $kid; + if ( $root->name eq 'leave' + and ($kid = $root->first)->name eq 'enter' + and !null($kid = $kid->sibling) and $kid->name eq 'stub' + and !null($kid = $kid->sibling) and $kid->name eq 'null' + and class($kid) eq 'COP' and null $kid->sibling ) + { + # ignore + } else { + $self->pessimise($root, main_start); + print $self->indent($self->deparse_root($root)), "\n"; + } } my @text; while (scalar(@{$self->{'subs_todo'}})) { diff --git a/lib/B/Deparse.t b/lib/B/Deparse.t index 1cf3b89..155a154 100644 --- a/lib/B/Deparse.t +++ b/lib/B/Deparse.t @@ -13,7 +13,7 @@ BEGIN { use warnings; use strict; -my $tests = 35; # not counting those in the __DATA__ section +my $tests = 36; # not counting those in the __DATA__ section use B::Deparse; my $deparse = B::Deparse->new(); @@ -140,7 +140,7 @@ like($a, qr/$b/, $a = `$^X $path "-MO=Deparse" -e "use constant PI => 4" 2>&1`; $a =~ s/-e syntax OK\n//g; -is($a, "();\nuse constant ('PI', 4);\n", +is($a, "use constant ('PI', 4);\n", "Proxy Constant Subroutines must not show up as (incorrect) prototypes"); #Re: perlbug #35857, patch #24505 @@ -188,7 +188,6 @@ EOFCODE $a = `$^X $path "-MO=Deparse" -e "sub ::::{}sub ::::::{}" 2>&1`; $a =~ s/-e syntax OK\n//g; is($a, <<'EOCODG', "sub :::: and sub ::::::"); -(); sub :::: { } @@ -225,7 +224,6 @@ $a = `$^X $path "-MO=Deparse" -e "BEGIN{*CORE::GLOBAL::require=sub{1}}" 2>&1`; $a =~ s/-e syntax OK\n//g; is($a, <<'EOCODF', "CORE::GLOBAL::require override causing panick"); -(); sub BEGIN { *CORE::GLOBAL::require = sub { 1; @@ -301,6 +299,18 @@ $foo . EOCODM +is runperl(stderr => 1, switches => [ '-MO=-qq,Deparse', $path ], + prog => "{ my \$x; format =\n\@\n\$x\n.\n}"), + <<'EOCODN', 'formats nested inside blocks'; +{ + my $x; + format STDOUT = +@ +$x +. +} +EOCODN + # CORE::format $a = readpipe qq`$^X $path "-MO=Deparse" -e "use feature q|:all|;` .qq` my sub format; CORE::format =" -e. 2>&1`; diff --git a/op.c b/op.c index f4f1cee..3162716 100644 --- a/op.c +++ b/op.c @@ -9068,6 +9068,7 @@ Perl_newFORM(pTHX_ I32 floor, OP *o, OP *block) if (PL_parser) PL_parser->copline = NOLINE; LEAVE_SCOPE(floor); + PL_compiling.cop_seq = 0; } OP * diff --git a/perly.act b/perly.act index 22a5fe2..0553cd4 100644 --- a/perly.act +++ b/perly.act @@ -209,11 +209,12 @@ case 2: SvREFCNT_inc_simple_void(fmtcv); pad_add_anon(fmtcv, OP_NULL); } + parser->parsed_sub = 1; ;} break; case 29: -#line 268 "perly.y" +#line 269 "perly.y" { if ((ps[(2) - (3)].val.opval)->op_type == OP_CONST) { const char *const name = @@ -238,7 +239,7 @@ case 2: break; case 30: -#line 290 "perly.y" +#line 291 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (ps[(2) - (7)].val.opval)->op_type == OP_CONST @@ -252,7 +253,7 @@ case 2: break; case 31: -#line 301 "perly.y" +#line 302 "perly.y" { package((ps[(3) - (4)].val.opval)); if ((ps[(2) - (4)].val.opval)) @@ -262,12 +263,12 @@ case 2: break; case 32: -#line 308 "perly.y" +#line 309 "perly.y" { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} break; case 33: -#line 310 "perly.y" +#line 311 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); utilize((ps[(1) - (7)].val.ival), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval)); @@ -277,7 +278,7 @@ case 2: break; case 34: -#line 317 "perly.y" +#line 318 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -286,7 +287,7 @@ case 2: break; case 35: -#line 323 "perly.y" +#line 324 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -295,7 +296,7 @@ case 2: break; case 36: -#line 329 "perly.y" +#line 330 "perly.y" { const PADOFFSET offset = pad_findmy_pvs("$_", 0); (yyval.opval) = block_end((ps[(3) - (6)].val.ival), @@ -309,17 +310,17 @@ case 2: break; case 37: -#line 340 "perly.y" +#line 341 "perly.y" { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;} break; case 38: -#line 342 "perly.y" +#line 343 "perly.y" { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;} break; case 39: -#line 344 "perly.y" +#line 345 "perly.y" { (yyval.opval) = block_end((ps[(3) - (8)].val.ival), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -329,7 +330,7 @@ case 2: break; case 40: -#line 351 "perly.y" +#line 352 "perly.y" { (yyval.opval) = block_end((ps[(3) - (8)].val.ival), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -339,17 +340,17 @@ case 2: break; case 41: -#line 358 "perly.y" +#line 359 "perly.y" { parser->expect = XTERM; ;} break; case 42: -#line 360 "perly.y" +#line 361 "perly.y" { parser->expect = XTERM; ;} break; case 43: -#line 363 "perly.y" +#line 364 "perly.y" { OP *initop = (ps[(4) - (13)].val.opval); OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -367,7 +368,7 @@ case 2: break; case 44: -#line 378 "perly.y" +#line 379 "perly.y" { (yyval.opval) = block_end((ps[(3) - (9)].val.ival), newFOROP(0, (ps[(4) - (9)].val.opval), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval))); parser->copline = (line_t)(ps[(1) - (9)].val.ival); @@ -375,7 +376,7 @@ case 2: break; case 45: -#line 383 "perly.y" +#line 384 "perly.y" { (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newFOROP(0, op_lvalue((ps[(2) - (8)].val.opval), OP_ENTERLOOP), (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval))); @@ -384,12 +385,12 @@ case 2: break; case 46: -#line 389 "perly.y" +#line 390 "perly.y" { parser->in_my = 0; (yyval.opval) = my((ps[(5) - (5)].val.opval)); ;} break; case 47: -#line 391 "perly.y" +#line 392 "perly.y" { (yyval.opval) = block_end( (ps[(4) - (11)].val.ival), @@ -405,7 +406,7 @@ case 2: break; case 48: -#line 404 "perly.y" +#line 405 "perly.y" { (yyval.opval) = block_end((ps[(5) - (9)].val.ival), newFOROP( 0, op_lvalue(newUNOP(OP_REFGEN, 0, @@ -416,7 +417,7 @@ case 2: break; case 49: -#line 412 "perly.y" +#line 413 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newFOROP(0, (OP*)NULL, (ps[(4) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval))); @@ -425,7 +426,7 @@ case 2: break; case 50: -#line 418 "perly.y" +#line 419 "perly.y" { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -434,7 +435,7 @@ case 2: break; case 51: -#line 424 "perly.y" +#line 425 "perly.y" { package((ps[(3) - (5)].val.opval)); if ((ps[(2) - (5)].val.opval)) { @@ -444,7 +445,7 @@ case 2: break; case 52: -#line 431 "perly.y" +#line 432 "perly.y" { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -455,14 +456,14 @@ case 2: break; case 53: -#line 439 "perly.y" +#line 440 "perly.y" { (yyval.opval) = (ps[(1) - (2)].val.opval); ;} break; case 54: -#line 443 "perly.y" +#line 444 "perly.y" { (yyval.opval) = (OP*)NULL; parser->copline = NOLINE; @@ -470,7 +471,7 @@ case 2: break; case 55: -#line 451 "perly.y" +#line 452 "perly.y" { OP *list; if ((ps[(2) - (2)].val.opval)) { OP *term = (ps[(2) - (2)].val.opval); @@ -488,63 +489,63 @@ case 2: break; case 56: -#line 468 "perly.y" +#line 469 "perly.y" { (yyval.opval) = NULL; ;} break; case 57: -#line 470 "perly.y" +#line 471 "perly.y" { (yyval.opval) = op_unscope((ps[(2) - (3)].val.opval)); ;} break; case 58: -#line 475 "perly.y" +#line 476 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 59: -#line 477 "perly.y" +#line 478 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 60: -#line 479 "perly.y" +#line 480 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); ;} break; case 61: -#line 481 "perly.y" +#line 482 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); ;} break; case 62: -#line 483 "perly.y" +#line 484 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval)); ;} break; case 63: -#line 485 "perly.y" +#line 486 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); ;} break; case 64: -#line 487 "perly.y" +#line 488 "perly.y" { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL); parser->copline = (line_t)(ps[(2) - (3)].val.ival); ;} break; case 65: -#line 490 "perly.y" +#line 491 "perly.y" { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;} break; case 66: -#line 495 "perly.y" +#line 496 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 67: -#line 497 "perly.y" +#line 498 "perly.y" { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); @@ -552,7 +553,7 @@ case 2: break; case 68: -#line 502 "perly.y" +#line 503 "perly.y" { parser->copline = (line_t)(ps[(1) - (6)].val.ival); (yyval.opval) = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)), @@ -562,119 +563,119 @@ case 2: break; case 69: -#line 512 "perly.y" +#line 513 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 70: -#line 514 "perly.y" +#line 515 "perly.y" { (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); ;} break; case 71: -#line 519 "perly.y" +#line 520 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); ;} break; case 72: -#line 525 "perly.y" +#line 526 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 74: -#line 531 "perly.y" +#line 532 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; ;} break; case 76: -#line 539 "perly.y" +#line 540 "perly.y" { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} break; case 77: -#line 544 "perly.y" +#line 545 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; case 78: -#line 548 "perly.y" +#line 549 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; case 79: -#line 552 "perly.y" +#line 553 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; case 80: -#line 555 "perly.y" +#line 556 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 81: -#line 556 "perly.y" +#line 557 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 82: -#line 560 "perly.y" +#line 561 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); ;} break; case 83: -#line 566 "perly.y" +#line 567 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); ;} break; case 84: -#line 571 "perly.y" +#line 572 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); ;} break; case 87: -#line 582 "perly.y" +#line 583 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 89: -#line 588 "perly.y" +#line 589 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 90: -#line 590 "perly.y" +#line 591 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); ;} break; case 91: -#line 592 "perly.y" +#line 593 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 92: -#line 597 "perly.y" +#line 598 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); ;} break; case 93: -#line 599 "perly.y" +#line 600 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 94: -#line 603 "perly.y" +#line 604 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 95: -#line 605 "perly.y" +#line 606 "perly.y" { if (!FEATURE_SIGNATURES_IS_ENABLED) Perl_croak(aTHX_ "Experimental " @@ -687,7 +688,7 @@ case 2: break; case 96: -#line 615 "perly.y" +#line 616 "perly.y" { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(2) - (3)].val.opval), newSTATEOP(0, NULL, sawparens(newNULLLIST()))); @@ -696,7 +697,7 @@ case 2: break; case 97: -#line 624 "perly.y" +#line 625 "perly.y" { if (parser->copline > (line_t)(ps[(3) - (5)].val.ival)) parser->copline = (line_t)(ps[(3) - (5)].val.ival); @@ -706,37 +707,37 @@ case 2: break; case 98: -#line 633 "perly.y" +#line 634 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 99: -#line 634 "perly.y" +#line 635 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 100: -#line 639 "perly.y" +#line 640 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;} break; case 101: -#line 641 "perly.y" +#line 642 "perly.y" { (yyval.opval) = newLOGOP((ps[(2) - (3)].val.ival), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;} break; case 102: -#line 643 "perly.y" +#line 644 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;} break; case 104: -#line 649 "perly.y" +#line 650 "perly.y" { (yyval.opval) = (ps[(1) - (2)].val.opval); ;} break; case 105: -#line 651 "perly.y" +#line 652 "perly.y" { OP* term = (ps[(3) - (3)].val.opval); (yyval.opval) = op_append_elem(OP_LIST, (ps[(1) - (3)].val.opval), term); @@ -744,21 +745,21 @@ case 2: break; case 107: -#line 660 "perly.y" +#line 661 "perly.y" { (yyval.opval) = op_convert_list((ps[(1) - (3)].val.ival), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF((ps[(1) - (3)].val.ival),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) ); ;} break; case 108: -#line 664 "perly.y" +#line 665 "perly.y" { (yyval.opval) = op_convert_list((ps[(1) - (5)].val.ival), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF((ps[(1) - (5)].val.ival),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) ); ;} break; case 109: -#line 668 "perly.y" +#line 669 "perly.y" { (yyval.opval) = op_convert_list(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)), @@ -767,7 +768,7 @@ case 2: break; case 110: -#line 674 "perly.y" +#line 675 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)), newMETHOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval)))); @@ -775,7 +776,7 @@ case 2: break; case 111: -#line 679 "perly.y" +#line 680 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)), @@ -784,7 +785,7 @@ case 2: break; case 112: -#line 685 "perly.y" +#line 686 "perly.y" { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)), @@ -793,23 +794,23 @@ case 2: break; case 113: -#line 691 "perly.y" +#line 692 "perly.y" { (yyval.opval) = op_convert_list((ps[(1) - (2)].val.ival), 0, (ps[(2) - (2)].val.opval)); ;} break; case 114: -#line 693 "perly.y" +#line 694 "perly.y" { (yyval.opval) = op_convert_list((ps[(1) - (4)].val.ival), 0, (ps[(3) - (4)].val.opval)); ;} break; case 115: -#line 695 "perly.y" +#line 696 "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 116: -#line 698 "perly.y" +#line 699 "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))); @@ -817,18 +818,18 @@ case 2: break; case 119: -#line 713 "perly.y" +#line 714 "perly.y" { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval))); ;} break; case 120: -#line 715 "perly.y" +#line 716 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval))); ;} break; case 121: -#line 718 "perly.y" +#line 719 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV), scalar((ps[(4) - (5)].val.opval))); @@ -836,7 +837,7 @@ case 2: break; case 122: -#line 723 "perly.y" +#line 724 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV), scalar((ps[(3) - (4)].val.opval))); @@ -844,78 +845,78 @@ case 2: break; case 123: -#line 728 "perly.y" +#line 729 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval))); ;} break; case 124: -#line 731 "perly.y" +#line 732 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV), jmaybe((ps[(4) - (6)].val.opval))); ;} break; case 125: -#line 735 "perly.y" +#line 736 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV), jmaybe((ps[(3) - (5)].val.opval))); ;} break; case 126: -#line 739 "perly.y" +#line 740 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[(1) - (4)].val.opval)))); ;} break; case 127: -#line 742 "perly.y" +#line 743 "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))))); ;} break; case 128: -#line 747 "perly.y" +#line 748 "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))))); ;} break; case 129: -#line 751 "perly.y" +#line 752 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[(1) - (3)].val.opval)))); ;} break; case 130: -#line 754 "perly.y" +#line 755 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval)); ;} break; case 131: -#line 756 "perly.y" +#line 757 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (4)].val.opval)); ;} break; case 132: -#line 758 "perly.y" +#line 759 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL); ;} break; case 133: -#line 763 "perly.y" +#line 764 "perly.y" { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), (ps[(2) - (3)].val.ival), (ps[(3) - (3)].val.opval)); ;} break; case 134: -#line 765 "perly.y" +#line 766 "perly.y" { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;} break; case 135: -#line 767 "perly.y" +#line 768 "perly.y" { if ((ps[(2) - (3)].val.ival) != OP_REPEAT) scalar((ps[(1) - (3)].val.opval)); (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval))); @@ -923,94 +924,94 @@ case 2: break; case 136: -#line 772 "perly.y" +#line 773 "perly.y" { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;} break; case 137: -#line 774 "perly.y" +#line 775 "perly.y" { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;} break; case 138: -#line 776 "perly.y" +#line 777 "perly.y" { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;} break; case 139: -#line 778 "perly.y" +#line 779 "perly.y" { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;} break; case 140: -#line 780 "perly.y" +#line 781 "perly.y" { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;} break; case 141: -#line 782 "perly.y" +#line 783 "perly.y" { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;} break; case 142: -#line 784 "perly.y" +#line 785 "perly.y" { (yyval.opval) = newRANGE((ps[(2) - (3)].val.ival), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;} break; case 143: -#line 786 "perly.y" +#line 787 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;} break; case 144: -#line 788 "perly.y" +#line 789 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;} break; case 145: -#line 790 "perly.y" +#line 791 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;} break; case 146: -#line 792 "perly.y" +#line 793 "perly.y" { (yyval.opval) = bind_match((ps[(2) - (3)].val.ival), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;} break; case 147: -#line 797 "perly.y" +#line 798 "perly.y" { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval))); ;} break; case 148: -#line 799 "perly.y" +#line 800 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); ;} break; case 149: -#line 802 "perly.y" +#line 803 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); ;} break; case 150: -#line 804 "perly.y" +#line 805 "perly.y" { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval))); ;} break; case 151: -#line 806 "perly.y" +#line 807 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC)); ;} break; case 152: -#line 809 "perly.y" +#line 810 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));;} break; case 153: -#line 812 "perly.y" +#line 813 "perly.y" { (yyval.opval) = op_convert_list(OP_JOIN, 0, op_append_elem( OP_LIST, @@ -1024,120 +1025,120 @@ case 2: break; case 154: -#line 823 "perly.y" +#line 824 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC)); ;} break; case 155: -#line 826 "perly.y" +#line 827 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC)); ;} break; case 156: -#line 833 "perly.y" +#line 834 "perly.y" { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval)); ;} break; case 157: -#line 835 "perly.y" +#line 836 "perly.y" { (yyval.opval) = newANONLIST((OP*)NULL);;} break; case 158: -#line 837 "perly.y" +#line 838 "perly.y" { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval)); ;} break; case 159: -#line 839 "perly.y" +#line 840 "perly.y" { (yyval.opval) = newANONHASH((OP*)NULL); ;} break; case 160: -#line 841 "perly.y" +#line 842 "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)); ;} break; case 161: -#line 848 "perly.y" +#line 849 "perly.y" { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), (ps[(1) - (2)].val.ival));;} break; case 162: -#line 850 "perly.y" +#line 851 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval)));;} break; case 167: -#line 858 "perly.y" +#line 859 "perly.y" { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval)); ;} break; case 168: -#line 860 "perly.y" +#line 861 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, op_lvalue((ps[(2) - (2)].val.opval),OP_REFGEN)); ;} break; case 169: -#line 862 "perly.y" +#line 863 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 170: -#line 864 "perly.y" +#line 865 "perly.y" { (yyval.opval) = localize((ps[(2) - (2)].val.opval),(ps[(1) - (2)].val.ival)); ;} break; case 171: -#line 866 "perly.y" +#line 867 "perly.y" { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;} break; case 172: -#line 868 "perly.y" +#line 869 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 173: -#line 870 "perly.y" +#line 871 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); ;} break; case 174: -#line 872 "perly.y" +#line 873 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 175: -#line 874 "perly.y" +#line 875 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 176: -#line 876 "perly.y" +#line 877 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 177: -#line 878 "perly.y" +#line 879 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 178: -#line 880 "perly.y" +#line 881 "perly.y" { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;} break; case 179: -#line 882 "perly.y" +#line 883 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 180: -#line 884 "perly.y" +#line 885 "perly.y" { (yyval.opval) = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1150,7 +1151,7 @@ case 2: break; case 181: -#line 894 "perly.y" +#line 895 "perly.y" { (yyval.opval) = op_prepend_elem(OP_KVASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVASLICE, 0, @@ -1163,7 +1164,7 @@ case 2: break; case 182: -#line 904 "perly.y" +#line 905 "perly.y" { (yyval.opval) = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1176,7 +1177,7 @@ case 2: break; case 183: -#line 914 "perly.y" +#line 915 "perly.y" { (yyval.opval) = op_prepend_elem(OP_KVHSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVHSLICE, 0, @@ -1189,23 +1190,23 @@ case 2: break; case 184: -#line 924 "perly.y" +#line 925 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 185: -#line 926 "perly.y" +#line 927 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;} break; case 186: -#line 928 "perly.y" +#line 929 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval))); ;} break; case 187: -#line 931 "perly.y" +#line 932 "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)))); @@ -1213,129 +1214,129 @@ case 2: break; case 188: -#line 936 "perly.y" +#line 937 "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)))); ;} break; case 189: -#line 940 "perly.y" +#line 941 "perly.y" { (yyval.opval) = newSVREF((ps[(1) - (4)].val.opval)); ;} break; case 190: -#line 942 "perly.y" +#line 943 "perly.y" { (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); ;} break; case 191: -#line 944 "perly.y" +#line 945 "perly.y" { (yyval.opval) = newHVREF((ps[(1) - (4)].val.opval)); ;} break; case 192: -#line 946 "perly.y" +#line 947 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar(newCVREF((ps[(3) - (4)].val.ival),(ps[(1) - (4)].val.opval)))); ;} break; case 193: -#line 949 "perly.y" +#line 950 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(1) - (4)].val.opval)); ;} break; case 194: -#line 951 "perly.y" +#line 952 "perly.y" { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), OPf_SPECIAL); PL_hints |= HINT_BLOCK_SCOPE; ;} break; case 195: -#line 954 "perly.y" +#line 955 "perly.y" { (yyval.opval) = newLOOPEX((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval)); ;} break; case 196: -#line 956 "perly.y" +#line 957 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); ;} break; case 197: -#line 958 "perly.y" +#line 959 "perly.y" { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), 0); ;} break; case 198: -#line 960 "perly.y" +#line 961 "perly.y" { (yyval.opval) = newUNOP((ps[(1) - (2)].val.ival), 0, (ps[(2) - (2)].val.opval)); ;} break; case 199: -#line 962 "perly.y" +#line 963 "perly.y" { (yyval.opval) = newUNOP((ps[(1) - (2)].val.ival), 0, (ps[(2) - (2)].val.opval)); ;} break; case 200: -#line 964 "perly.y" +#line 965 "perly.y" { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.ival) ? OPf_SPECIAL : 0); ;} break; case 201: -#line 966 "perly.y" +#line 967 "perly.y" { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.ival) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval)); ;} break; case 202: -#line 968 "perly.y" +#line 969 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; case 203: -#line 970 "perly.y" +#line 971 "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 204: -#line 973 "perly.y" +#line 974 "perly.y" { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), 0); ;} break; case 205: -#line 975 "perly.y" +#line 976 "perly.y" { (yyval.opval) = newOP((ps[(1) - (3)].val.ival), 0);;} break; case 206: -#line 977 "perly.y" +#line 978 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 207: -#line 979 "perly.y" +#line 980 "perly.y" { (yyval.opval) = (ps[(1) - (3)].val.opval); ;} break; case 208: -#line 981 "perly.y" +#line 982 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; case 209: -#line 983 "perly.y" +#line 984 "perly.y" { (yyval.opval) = ((ps[(1) - (3)].val.ival) == OP_NOT) ? newUNOP((ps[(1) - (3)].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0))) : newOP((ps[(1) - (3)].val.ival), OPf_SPECIAL); ;} break; case 210: -#line 987 "perly.y" +#line 988 "perly.y" { (yyval.opval) = newUNOP((ps[(1) - (4)].val.ival), 0, (ps[(3) - (4)].val.opval)); ;} break; case 211: -#line 989 "perly.y" +#line 990 "perly.y" { if ( (ps[(1) - (1)].val.opval)->op_type != OP_TRANS && (ps[(1) - (1)].val.opval)->op_type != OP_TRANSR @@ -1349,12 +1350,12 @@ case 2: break; case 212: -#line 1000 "perly.y" +#line 1001 "perly.y" { (yyval.opval) = pmruntime((ps[(1) - (5)].val.opval), (ps[(4) - (5)].val.opval), 1, (ps[(2) - (5)].val.ival)); ;} break; case 215: -#line 1004 "perly.y" +#line 1005 "perly.y" { (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); @@ -1362,136 +1363,136 @@ case 2: break; case 217: -#line 1013 "perly.y" +#line 1014 "perly.y" { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval)); ;} break; case 218: -#line 1015 "perly.y" +#line 1016 "perly.y" { (yyval.opval) = localize((ps[(2) - (2)].val.opval),(ps[(1) - (2)].val.ival)); ;} break; case 219: -#line 1020 "perly.y" +#line 1021 "perly.y" { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;} break; case 220: -#line 1022 "perly.y" +#line 1023 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); ;} break; case 221: -#line 1025 "perly.y" +#line 1026 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 222: -#line 1027 "perly.y" +#line 1028 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 223: -#line 1029 "perly.y" +#line 1030 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 224: -#line 1034 "perly.y" +#line 1035 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 225: -#line 1036 "perly.y" +#line 1037 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 226: -#line 1040 "perly.y" +#line 1041 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 227: -#line 1042 "perly.y" +#line 1043 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 228: -#line 1048 "perly.y" +#line 1049 "perly.y" { parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} break; case 234: -#line 1061 "perly.y" +#line 1062 "perly.y" { (yyval.opval) = newCVREF((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval)); ;} break; case 235: -#line 1065 "perly.y" +#line 1066 "perly.y" { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); ;} break; case 236: -#line 1069 "perly.y" +#line 1070 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= (ps[(1) - (2)].val.ival); ;} break; case 237: -#line 1075 "perly.y" +#line 1076 "perly.y" { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= (ps[(1) - (2)].val.ival); ;} break; case 238: -#line 1081 "perly.y" +#line 1082 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); ;} break; case 239: -#line 1083 "perly.y" +#line 1084 "perly.y" { (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); ;} break; case 240: -#line 1087 "perly.y" +#line 1088 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); ;} break; case 242: -#line 1092 "perly.y" +#line 1093 "perly.y" { (yyval.opval) = newAVREF((ps[(1) - (3)].val.opval)); ;} break; case 244: -#line 1097 "perly.y" +#line 1098 "perly.y" { (yyval.opval) = newHVREF((ps[(1) - (3)].val.opval)); ;} break; case 246: -#line 1102 "perly.y" +#line 1103 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(1) - (3)].val.opval)); ;} break; case 247: -#line 1107 "perly.y" +#line 1108 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; case 248: -#line 1109 "perly.y" +#line 1110 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; case 249: -#line 1111 "perly.y" +#line 1112 "perly.y" { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;} break; case 250: -#line 1114 "perly.y" +#line 1115 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; @@ -1502,6 +1503,6 @@ case 2: /* Generated from: - * 7c925861de53b976298e1b6e79a731de2d11247fd3db73f423cba0fd8c2e1afe perly.y + * 483e652a7d8fe19f0ca9b30539b01d530f0fa872a8b4cfab025c589aa581d7d2 perly.y * d1d4df7b8e30ac9dede664af9179e6e5e7ddc7f2ad9c4eff9e2e5b32c9e16a6e regen_perly.pl * ex: set ro: */ diff --git a/perly.h b/perly.h index b458b23..90565cd 100644 --- a/perly.h +++ b/perly.h @@ -256,6 +256,6 @@ typedef union YYSTYPE /* Generated from: - * 7c925861de53b976298e1b6e79a731de2d11247fd3db73f423cba0fd8c2e1afe perly.y + * 483e652a7d8fe19f0ca9b30539b01d530f0fa872a8b4cfab025c589aa581d7d2 perly.y * d1d4df7b8e30ac9dede664af9179e6e5e7ddc7f2ad9c4eff9e2e5b32c9e16a6e regen_perly.pl * ex: set ro: */ diff --git a/perly.tab b/perly.tab index 401c95c..db2ad81 100644 --- a/perly.tab +++ b/perly.tab @@ -193,30 +193,30 @@ static const yytype_uint16 yyrline[] = { 0, 115, 115, 114, 125, 124, 134, 133, 146, 145, 158, 157, 170, 169, 181, 189, 197, 201, 209, 215, - 216, 226, 227, 236, 240, 244, 248, 255, 257, 268, - 267, 300, 308, 307, 316, 322, 328, 339, 341, 343, - 350, 358, 360, 357, 377, 382, 389, 388, 403, 411, - 417, 424, 423, 438, 442, 450, 468, 469, 474, 476, - 478, 480, 482, 484, 486, 489, 495, 496, 501, 512, - 513, 519, 525, 526, 531, 534, 538, 543, 547, 551, - 555, 556, 560, 566, 571, 576, 577, 582, 583, 588, - 589, 591, 596, 598, 603, 605, 604, 623, 633, 634, - 638, 640, 642, 644, 648, 650, 655, 659, 663, 667, - 673, 678, 684, 690, 692, 695, 694, 705, 706, 710, - 714, 717, 722, 727, 730, 734, 738, 741, 746, 750, - 753, 755, 757, 762, 764, 766, 771, 773, 775, 777, - 779, 781, 783, 785, 787, 789, 791, 796, 798, 801, - 803, 805, 808, 811, 822, 825, 832, 834, 836, 838, - 840, 847, 849, 853, 854, 855, 856, 857, 859, 861, - 863, 865, 867, 869, 871, 873, 875, 877, 879, 881, - 883, 893, 903, 913, 923, 925, 927, 930, 935, 939, - 941, 943, 945, 948, 950, 953, 955, 957, 959, 961, - 963, 965, 967, 969, 972, 974, 976, 978, 980, 982, - 986, 989, 988, 1001, 1002, 1003, 1008, 1012, 1014, 1019, - 1021, 1024, 1026, 1028, 1033, 1035, 1040, 1041, 1047, 1051, - 1052, 1053, 1056, 1057, 1060, 1064, 1068, 1074, 1080, 1082, - 1086, 1090, 1091, 1095, 1096, 1100, 1101, 1106, 1108, 1110, - 1113 + 216, 226, 227, 236, 240, 244, 248, 255, 257, 269, + 268, 301, 309, 308, 317, 323, 329, 340, 342, 344, + 351, 359, 361, 358, 378, 383, 390, 389, 404, 412, + 418, 425, 424, 439, 443, 451, 469, 470, 475, 477, + 479, 481, 483, 485, 487, 490, 496, 497, 502, 513, + 514, 520, 526, 527, 532, 535, 539, 544, 548, 552, + 556, 557, 561, 567, 572, 577, 578, 583, 584, 589, + 590, 592, 597, 599, 604, 606, 605, 624, 634, 635, + 639, 641, 643, 645, 649, 651, 656, 660, 664, 668, + 674, 679, 685, 691, 693, 696, 695, 706, 707, 711, + 715, 718, 723, 728, 731, 735, 739, 742, 747, 751, + 754, 756, 758, 763, 765, 767, 772, 774, 776, 778, + 780, 782, 784, 786, 788, 790, 792, 797, 799, 802, + 804, 806, 809, 812, 823, 826, 833, 835, 837, 839, + 841, 848, 850, 854, 855, 856, 857, 858, 860, 862, + 864, 866, 868, 870, 872, 874, 876, 878, 880, 882, + 884, 894, 904, 914, 924, 926, 928, 931, 936, 940, + 942, 944, 946, 949, 951, 954, 956, 958, 960, 962, + 964, 966, 968, 970, 973, 975, 977, 979, 981, 983, + 987, 990, 989, 1002, 1003, 1004, 1009, 1013, 1015, 1020, + 1022, 1025, 1027, 1029, 1034, 1036, 1041, 1042, 1048, 1052, + 1053, 1054, 1057, 1058, 1061, 1065, 1069, 1075, 1081, 1083, + 1087, 1091, 1092, 1096, 1097, 1101, 1102, 1107, 1109, 1111, + 1114 }; #endif @@ -1140,6 +1140,6 @@ static const toketypes yy_type_tab[] = }; /* Generated from: - * 7c925861de53b976298e1b6e79a731de2d11247fd3db73f423cba0fd8c2e1afe perly.y + * 483e652a7d8fe19f0ca9b30539b01d530f0fa872a8b4cfab025c589aa581d7d2 perly.y * d1d4df7b8e30ac9dede664af9179e6e5e7ddc7f2ad9c4eff9e2e5b32c9e16a6e regen_perly.pl * ex: set ro: */ diff --git a/perly.y b/perly.y index 6ba61ae..64fc6ac 100644 --- a/perly.y +++ b/perly.y @@ -263,6 +263,7 @@ barestmt: PLUGSTMT SvREFCNT_inc_simple_void(fmtcv); pad_add_anon(fmtcv, OP_NULL); } + parser->parsed_sub = 1; } | SUB subname startsub { -- Perl5 Master Repository
