In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/49fb862041f1f74fafbc91afa553624c43078261?hp=0cf18b74ec1005ca929e64dd9158674d5163ff0a>

- Log -----------------------------------------------------------------
commit 49fb862041f1f74fafbc91afa553624c43078261
Author: David Mitchell <[email protected]>
Date:   Thu Aug 18 09:53:11 2016 +0100

    signatures: eliminate XSIGVAR, add KEY_sigvar
    
    When I moved subroutine signature processing into perly.y with
    v5.25.3-101-gd3d9da4, I added a new lexer PL_expect state, XSIGVAR.
    
    This indicated, when about to parse a variable, that it was a signature
    element rather than a my variable; in particular, it makes ($,...)
    be toked as the lone sigil '$' rather than the punctuation variable '$,'.
    
    However this is a bit heavy-handled; so instead this commit adds a
    new allowed pseudo-keyword value to PL_in_my: as well as KEY_my, KEY_our and
    KEY_state, it can now be KEY_sigvar. This is a less intrusive change
    to the lexer.
-----------------------------------------------------------------------

Summary of changes:
 embed.fnc         |    2 +-
 embed.h           |    2 +-
 pad.c             |    5 +-
 perl.h            |    3 +-
 perly.act         | 1556 +++++++++++++++++++++++++++++++----------------------
 perly.h           |  297 ++++------
 perly.tab         | 1482 +++++++++++++++++++++++---------------------------
 perly.y           |   13 +-
 proto.h           |    2 +-
 t/op/signatures.t |    4 +-
 toke.c            |   21 +-
 11 files changed, 1716 insertions(+), 1671 deletions(-)

diff --git a/embed.fnc b/embed.fnc
index 10f09cb..38e8cf9 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -2539,7 +2539,7 @@ s |int    |intuit_more    |NN char *s
 s      |I32    |lop            |I32 f|int x|NN char *s
 rs     |void   |missingterm    |NULLOK char *s
 s      |void   |no_op          |NN const char *const what|NULLOK char *s
-s      |int    |pending_ident  |bool is_sig
+s      |int    |pending_ident
 sR     |I32    |sublex_done
 sR     |I32    |sublex_push
 sR     |I32    |sublex_start
diff --git a/embed.h b/embed.h
index 7b4efff..f3a855e 100644
--- a/embed.h
+++ b/embed.h
@@ -1787,7 +1787,7 @@
 #define missingterm(a)         S_missingterm(aTHX_ a)
 #define no_op(a,b)             S_no_op(aTHX_ a,b)
 #define parse_ident(a,b,c,d,e,f)       S_parse_ident(aTHX_ a,b,c,d,e,f)
-#define pending_ident(a)       S_pending_ident(aTHX_ a)
+#define pending_ident()                S_pending_ident(aTHX)
 #define scan_const(a)          S_scan_const(aTHX_ a)
 #define scan_formline(a)       S_scan_formline(aTHX_ a)
 #define scan_heredoc(a)                S_scan_heredoc(aTHX_ a)
diff --git a/pad.c b/pad.c
index 9773a25..a41d2c7 100644
--- a/pad.c
+++ b/pad.c
@@ -898,7 +898,10 @@ S_pad_check_dup(pTHX_ PADNAME *name, U32 flags, const HV 
*ourstash)
            /* diag_listed_as: "%s" variable %s masks earlier declaration in 
same %s */
            Perl_warner(aTHX_ packWARN(WARN_MISC),
                "\"%s\" %s %"PNf" masks earlier declaration in same %s",
-               (is_our ? "our" : PL_parser->in_my == KEY_my ? "my" : "state"),
+               (   is_our                         ? "our"   :
+                    PL_parser->in_my == KEY_my     ? "my"    :
+                    PL_parser->in_my == KEY_sigvar ? "my"    :
+                                                     "state" ),
                *PadnamePV(sv) == '&' ? "subroutine" : "variable",
                PNfARG(sv),
                (COP_SEQ_RANGE_HIGH(sv) == PERL_PADSEQ_INTRO
diff --git a/perl.h b/perl.h
index b7c866a..9509be2 100644
--- a/perl.h
+++ b/perl.h
@@ -5327,11 +5327,12 @@ typedef enum {
     XTERMBLOCK,
     XBLOCKTERM,
     XPOSTDEREF,
-    XSIGVAR,     /* expecting a var in a sub  signature */
     XTERMORDORDOR /* evil hack */
     /* update exp_name[] in toke.c if adding to this enum */
 } expectation;
 
+#define KEY_sigvar 0xFFFF /* fake keyword representing a signature var */
+
 /* Hints are now stored in a dedicated U32, so the bottom 8 bits are no longer
    special and there is no need for HINT_PRIVATE_MASK for COPs
    However, bitops store HINT_INTEGER in their op_private.
diff --git a/perly.act b/perly.act
index 3626904..56285e9 100644
--- a/perly.act
+++ b/perly.act
@@ -5,219 +5,246 @@
  */
 
 case 2:
-#line 118 "perly.y"
+#line 118 "perly.y" /* yacc.c:1646  */
     {
                          parser->expect = XSTATE;
-                       ;}
+                       }
+
     break;
 
   case 3:
-#line 122 "perly.y"
+#line 122 "perly.y" /* yacc.c:1646  */
     {
-                         newPROG(block_end((ps[(3) - (4)].val.ival),(ps[(4) - 
(4)].val.opval)));
+                         
newPROG(block_end((ps[-1].val.ival),(ps[0].val.opval)));
                          PL_compiling.cop_seq = 0;
                          (yyval.ival) = 0;
-                       ;}
+                       }
+
     break;
 
   case 4:
-#line 128 "perly.y"
+#line 128 "perly.y" /* yacc.c:1646  */
     {
                          parser->expect = XTERM;
-                       ;}
+                       }
+
     break;
 
   case 5:
-#line 132 "perly.y"
+#line 132 "perly.y" /* yacc.c:1646  */
     {
-                         PL_eval_root = (ps[(3) - (3)].val.opval);
+                         PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
-                       ;}
+                       }
+
     break;
 
   case 6:
-#line 137 "perly.y"
+#line 137 "perly.y" /* yacc.c:1646  */
     {
                          parser->expect = XBLOCK;
-                       ;}
+                       }
+
     break;
 
   case 7:
-#line 141 "perly.y"
+#line 141 "perly.y" /* yacc.c:1646  */
     {
                          PL_pad_reset_pending = TRUE;
-                         PL_eval_root = (ps[(3) - (3)].val.opval);
+                         PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                          yyunlex();
                          parser->yychar = YYEOF;
-                       ;}
+                       }
+
     break;
 
   case 8:
-#line 149 "perly.y"
+#line 149 "perly.y" /* yacc.c:1646  */
     {
                          parser->expect = XSTATE;
-                       ;}
+                       }
+
     break;
 
   case 9:
-#line 153 "perly.y"
+#line 153 "perly.y" /* yacc.c:1646  */
     {
                          PL_pad_reset_pending = TRUE;
-                         PL_eval_root = (ps[(3) - (3)].val.opval);
+                         PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                          yyunlex();
                          parser->yychar = YYEOF;
-                       ;}
+                       }
+
     break;
 
   case 10:
-#line 161 "perly.y"
+#line 161 "perly.y" /* yacc.c:1646  */
     {
                          parser->expect = XSTATE;
-                       ;}
+                       }
+
     break;
 
   case 11:
-#line 165 "perly.y"
+#line 165 "perly.y" /* yacc.c:1646  */
     {
                          PL_pad_reset_pending = TRUE;
-                         PL_eval_root = (ps[(3) - (3)].val.opval);
+                         PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                          yyunlex();
                          parser->yychar = YYEOF;
-                       ;}
+                       }
+
     break;
 
   case 12:
-#line 173 "perly.y"
+#line 173 "perly.y" /* yacc.c:1646  */
     {
                          parser->expect = XSTATE;
-                       ;}
+                       }
+
     break;
 
   case 13:
-#line 177 "perly.y"
+#line 177 "perly.y" /* yacc.c:1646  */
     {
-                         PL_eval_root = (ps[(3) - (3)].val.opval);
+                         PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
-                       ;}
+                       }
+
     break;
 
   case 14:
-#line 185 "perly.y"
-    { if (parser->copline > (line_t)(ps[(1) - (4)].val.ival))
-                             parser->copline = (line_t)(ps[(1) - 
(4)].val.ival);
-                         (yyval.opval) = block_end((ps[(2) - (4)].val.ival), 
(ps[(3) - (4)].val.opval));
-                       ;}
+#line 185 "perly.y" /* yacc.c:1646  */
+    { if (parser->copline > (line_t)(ps[-3].val.ival))
+                             parser->copline = (line_t)(ps[-3].val.ival);
+                         (yyval.opval) = block_end((ps[-2].val.ival), 
(ps[-1].val.opval));
+                       }
+
     break;
 
   case 15:
-#line 193 "perly.y"
-    { if (parser->copline > (line_t)(ps[(1) - (7)].val.ival))
-                             parser->copline = (line_t)(ps[(1) - 
(7)].val.ival);
-                         (yyval.opval) = block_end((ps[(2) - (7)].val.ival), 
(ps[(5) - (7)].val.opval));
-                       ;}
+#line 193 "perly.y" /* yacc.c:1646  */
+    { if (parser->copline > (line_t)(ps[-6].val.ival))
+                             parser->copline = (line_t)(ps[-6].val.ival);
+                         (yyval.opval) = block_end((ps[-5].val.ival), 
(ps[-2].val.opval));
+                       }
+
     break;
 
   case 16:
-#line 200 "perly.y"
+#line 200 "perly.y" /* yacc.c:1646  */
     { (yyval.ival) = block_start(TRUE);
-                         parser->parsed_sub = 0; ;}
+                         parser->parsed_sub = 0; }
+
     break;
 
   case 17:
-#line 205 "perly.y"
-    { if (parser->copline > (line_t)(ps[(1) - (4)].val.ival))
-                             parser->copline = (line_t)(ps[(1) - 
(4)].val.ival);
-                         (yyval.opval) = block_end((ps[(2) - (4)].val.ival), 
(ps[(3) - (4)].val.opval));
-                       ;}
+#line 205 "perly.y" /* yacc.c:1646  */
+    { if (parser->copline > (line_t)(ps[-3].val.ival))
+                             parser->copline = (line_t)(ps[-3].val.ival);
+                         (yyval.opval) = block_end((ps[-2].val.ival), 
(ps[-1].val.opval));
+                       }
+
     break;
 
   case 18:
-#line 212 "perly.y"
+#line 212 "perly.y" /* yacc.c:1646  */
     { (yyval.ival) = block_start(FALSE);
-                         parser->parsed_sub = 0; ;}
+                         parser->parsed_sub = 0; }
+
     break;
 
   case 19:
-#line 218 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 218 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 20:
-#line 220 "perly.y"
-    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), 
(ps[(2) - (2)].val.opval));
+#line 220 "perly.y" /* yacc.c:1646  */
+    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), 
(ps[0].val.opval));
                            PL_pad_reset_pending = TRUE;
-                           if ((ps[(1) - (2)].val.opval) && (ps[(2) - 
(2)].val.opval))
+                           if ((ps[-1].val.opval) && (ps[0].val.opval))
                                PL_hints |= HINT_BLOCK_SCOPE;
-                       ;}
+                       }
+
     break;
 
   case 21:
-#line 229 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 229 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 22:
-#line 231 "perly.y"
-    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), 
(ps[(2) - (2)].val.opval));
+#line 231 "perly.y" /* yacc.c:1646  */
+    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), 
(ps[0].val.opval));
                            PL_pad_reset_pending = TRUE;
-                           if ((ps[(1) - (2)].val.opval) && (ps[(2) - 
(2)].val.opval))
+                           if ((ps[-1].val.opval) && (ps[0].val.opval))
                                PL_hints |= HINT_BLOCK_SCOPE;
-                       ;}
+                       }
+
     break;
 
   case 23:
-#line 240 "perly.y"
+#line 240 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = (ps[(1) - (1)].val.opval) ? 
newSTATEOP(0, NULL, (ps[(1) - (1)].val.opval)) : NULL;
-                       ;}
+                         (yyval.opval) = (ps[0].val.opval) ? newSTATEOP(0, 
NULL, (ps[0].val.opval)) : NULL;
+                       }
+
     break;
 
   case 24:
-#line 244 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 244 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 25:
-#line 248 "perly.y"
+#line 248 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = newSTATEOP(SVf_UTF8 * (ps[(1) - 
(2)].val.pval)[strlen((ps[(1) - (2)].val.pval))+1], (ps[(1) - (2)].val.pval), 
(ps[(2) - (2)].val.opval));
-                       ;}
+                         (yyval.opval) = newSTATEOP(SVf_UTF8 * 
(ps[-1].val.pval)[strlen((ps[-1].val.pval))+1], (ps[-1].val.pval), 
(ps[0].val.opval));
+                       }
+
     break;
 
   case 26:
-#line 252 "perly.y"
+#line 252 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = newSTATEOP(SVf_UTF8 * (ps[(1) - 
(2)].val.pval)[strlen((ps[(1) - (2)].val.pval))+1], (ps[(1) - (2)].val.pval), 
(ps[(2) - (2)].val.opval));
-                       ;}
+                         (yyval.opval) = newSTATEOP(SVf_UTF8 * 
(ps[-1].val.pval)[strlen((ps[-1].val.pval))+1], (ps[-1].val.pval), 
(ps[0].val.opval));
+                       }
+
     break;
 
   case 27:
-#line 259 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 259 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 28:
-#line 261 "perly.y"
+#line 261 "perly.y" /* yacc.c:1646  */
     {
                          CV *fmtcv = PL_compcv;
-                         newFORM((ps[(2) - (4)].val.ival), (ps[(3) - 
(4)].val.opval), (ps[(4) - (4)].val.opval));
+                         newFORM((ps[-2].val.ival), (ps[-1].val.opval), 
(ps[0].val.opval));
                          (yyval.opval) = (OP*)NULL;
                          if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
                              pad_add_weakref(fmtcv);
                          }
                          parser->parsed_sub = 1;
-                       ;}
+                       }
+
     break;
 
   case 29:
-#line 271 "perly.y"
+#line 271 "perly.y" /* yacc.c:1646  */
     {
-                         if ((ps[(2) - (3)].val.opval)->op_type == OP_CONST) {
+                         if ((ps[-1].val.opval)->op_type == OP_CONST) {
                            const char *const name =
-                               SvPV_nolen_const(((SVOP*)(ps[(2) - 
(3)].val.opval))->op_sv);
+                               
SvPV_nolen_const(((SVOP*)(ps[-1].val.opval))->op_sv);
                            if (strEQ(name, "BEGIN") || strEQ(name, "END")
                              || strEQ(name, "INIT") || strEQ(name, "CHECK")
                              || strEQ(name, "UNITCHECK"))
@@ -230,33 +257,35 @@ case 2:
                           || CvCLONE(CvOUTSIDE(PL_compcv))
                           || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
                                                CvOUTSIDE(PL_compcv)
-                                            ))[(ps[(2) - 
(3)].val.opval)->op_targ]))
+                                            ))[(ps[-1].val.opval)->op_targ]))
                              CvCLONE_on(PL_compcv);
                          parser->in_my = 0;
                          parser->in_my_stash = NULL;
-                       ;}
+                       }
+
     break;
 
   case 30:
-#line 293 "perly.y"
+#line 293 "perly.y" /* yacc.c:1646  */
     {
                          SvREFCNT_inc_simple_void(PL_compcv);
-                         (ps[(2) - (7)].val.opval)->op_type == OP_CONST
-                             ? newATTRSUB((ps[(3) - (7)].val.ival), (ps[(2) - 
(7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) 
- (7)].val.opval))
-                             : newMYSUB((ps[(3) - (7)].val.ival), (ps[(2) - 
(7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) 
- (7)].val.opval))
+                         (ps[-5].val.opval)->op_type == OP_CONST
+                             ? newATTRSUB((ps[-4].val.ival), 
(ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval))
+                             : newMYSUB((ps[-4].val.ival), (ps[-5].val.opval), 
(ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval))
                          ;
                          (yyval.opval) = (OP*)NULL;
                          intro_my();
                          parser->parsed_sub = 1;
-                       ;}
+                       }
+
     break;
 
   case 31:
-#line 304 "perly.y"
+#line 304 "perly.y" /* yacc.c:1646  */
     {
-                         if ((ps[(2) - (3)].val.opval)->op_type == OP_CONST) {
+                         if ((ps[-1].val.opval)->op_type == OP_CONST) {
                            const char *const name =
-                               SvPV_nolen_const(((SVOP*)(ps[(2) - 
(3)].val.opval))->op_sv);
+                               
SvPV_nolen_const(((SVOP*)(ps[-1].val.opval))->op_sv);
                            if (strEQ(name, "BEGIN") || strEQ(name, "END")
                              || strEQ(name, "INIT") || strEQ(name, "CHECK")
                              || strEQ(name, "UNITCHECK"))
@@ -269,130 +298,144 @@ case 2:
                           || CvCLONE(CvOUTSIDE(PL_compcv))
                           || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
                                                CvOUTSIDE(PL_compcv)
-                                            ))[(ps[(2) - 
(3)].val.opval)->op_targ]))
+                                            ))[(ps[-1].val.opval)->op_targ]))
                              CvCLONE_on(PL_compcv);
                          parser->in_my = 0;
                          parser->in_my_stash = NULL;
-                       ;}
+                       }
+
     break;
 
   case 32:
-#line 326 "perly.y"
+#line 326 "perly.y" /* yacc.c:1646  */
     {
                          OP *body;
-                         if (parser->copline > (line_t)(ps[(8) - 
(10)].val.ival))
-                             parser->copline = (line_t)(ps[(8) - 
(10)].val.ival);
-                         body = block_end((ps[(5) - (10)].val.ival),
-                               op_append_list(OP_LINESEQ, (ps[(6) - 
(10)].val.opval), (ps[(9) - (10)].val.opval)));
+                         if (parser->copline > (line_t)(ps[-2].val.ival))
+                             parser->copline = (line_t)(ps[-2].val.ival);
+                         body = block_end((ps[-5].val.ival),
+                               op_append_list(OP_LINESEQ, (ps[-4].val.opval), 
(ps[-1].val.opval)));
 
                          SvREFCNT_inc_simple_void(PL_compcv);
-                         (ps[(2) - (10)].val.opval)->op_type == OP_CONST
-                             ? newATTRSUB((ps[(3) - (10)].val.ival), (ps[(2) - 
(10)].val.opval), NULL, (ps[(7) - (10)].val.opval), body)
-                             : newMYSUB((ps[(3) - (10)].val.ival), (ps[(2) - 
(10)].val.opval), NULL, (ps[(7) - (10)].val.opval), body)
+                         (ps[-8].val.opval)->op_type == OP_CONST
+                             ? newATTRSUB((ps[-7].val.ival), 
(ps[-8].val.opval), NULL, (ps[-3].val.opval), body)
+                             : newMYSUB((ps[-7].val.ival), (ps[-8].val.opval), 
NULL, (ps[-3].val.opval), body)
                          ;
                          (yyval.opval) = (OP*)NULL;
                          intro_my();
                          parser->parsed_sub = 1;
-                       ;}
+                       }
+
     break;
 
   case 33:
-#line 343 "perly.y"
+#line 343 "perly.y" /* yacc.c:1646  */
     {
-                         package((ps[(3) - (4)].val.opval));
-                         if ((ps[(2) - (4)].val.opval))
-                             package_version((ps[(2) - (4)].val.opval));
+                         package((ps[-1].val.opval));
+                         if ((ps[-2].val.opval))
+                             package_version((ps[-2].val.opval));
                          (yyval.opval) = (OP*)NULL;
-                       ;}
+                       }
+
     break;
 
   case 34:
-#line 350 "perly.y"
-    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
+#line 350 "perly.y" /* yacc.c:1646  */
+    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
+
     break;
 
   case 35:
-#line 352 "perly.y"
+#line 352 "perly.y" /* yacc.c:1646  */
     {
                          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));
+                         utilize((ps[-6].val.ival), (ps[-5].val.ival), 
(ps[-3].val.opval), (ps[-2].val.opval), (ps[-1].val.opval));
                          parser->parsed_sub = 1;
                          (yyval.opval) = (OP*)NULL;
-                       ;}
+                       }
+
     break;
 
   case 36:
-#line 359 "perly.y"
+#line 359 "perly.y" /* yacc.c:1646  */
     {
-                         (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)));
-                         parser->copline = (line_t)(ps[(1) - (7)].val.ival);
-                       ;}
+                         (yyval.opval) = block_end((ps[-4].val.ival),
+                             newCONDOP(0, (ps[-3].val.opval), 
op_scope((ps[-1].val.opval)), (ps[0].val.opval)));
+                         parser->copline = (line_t)(ps[-6].val.ival);
+                       }
+
     break;
 
   case 37:
-#line 365 "perly.y"
+#line 365 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
-                              newCONDOP(0, (ps[(4) - (7)].val.opval), (ps[(7) 
- (7)].val.opval), op_scope((ps[(6) - (7)].val.opval))));
-                         parser->copline = (line_t)(ps[(1) - (7)].val.ival);
-                       ;}
+                         (yyval.opval) = block_end((ps[-4].val.ival),
+                              newCONDOP(0, (ps[-3].val.opval), 
(ps[0].val.opval), op_scope((ps[-1].val.opval))));
+                         parser->copline = (line_t)(ps[-6].val.ival);
+                       }
+
     break;
 
   case 38:
-#line 371 "perly.y"
+#line 371 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = block_end((ps[(3) - (6)].val.ival), 
newGIVENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)), 0));
-                         parser->copline = (line_t)(ps[(1) - (6)].val.ival);
-                       ;}
+                         (yyval.opval) = block_end((ps[-3].val.ival), 
newGIVENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)), 0));
+                         parser->copline = (line_t)(ps[-5].val.ival);
+                       }
+
     break;
 
   case 39:
-#line 376 "perly.y"
-    { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - 
(6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;}
+#line 376 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = block_end((ps[-3].val.ival), 
newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); }
+
     break;
 
   case 40:
-#line 378 "perly.y"
-    { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;}
+#line 378 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); }
+
     break;
 
   case 41:
-#line 380 "perly.y"
+#line 380 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = block_end((ps[(3) - (8)].val.ival),
+                         (yyval.opval) = block_end((ps[-5].val.ival),
                                  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-                                     (ps[(4) - (8)].val.opval), (ps[(7) - 
(8)].val.opval), (ps[(8) - (8)].val.opval), (ps[(6) - (8)].val.ival)));
-                         parser->copline = (line_t)(ps[(1) - (8)].val.ival);
-                       ;}
+                                     (ps[-4].val.opval), (ps[-1].val.opval), 
(ps[0].val.opval), (ps[-2].val.ival)));
+                         parser->copline = (line_t)(ps[-7].val.ival);
+                       }
+
     break;
 
   case 42:
-#line 387 "perly.y"
+#line 387 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = block_end((ps[(3) - (8)].val.ival),
+                         (yyval.opval) = block_end((ps[-5].val.ival),
                                  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-                                     (ps[(4) - (8)].val.opval), (ps[(7) - 
(8)].val.opval), (ps[(8) - (8)].val.opval), (ps[(6) - (8)].val.ival)));
-                         parser->copline = (line_t)(ps[(1) - (8)].val.ival);
-                       ;}
+                                     (ps[-4].val.opval), (ps[-1].val.opval), 
(ps[0].val.opval), (ps[-2].val.ival)));
+                         parser->copline = (line_t)(ps[-7].val.ival);
+                       }
+
     break;
 
   case 43:
-#line 394 "perly.y"
-    { parser->expect = XTERM; ;}
+#line 394 "perly.y" /* yacc.c:1646  */
+    { parser->expect = XTERM; }
+
     break;
 
   case 44:
-#line 396 "perly.y"
-    { parser->expect = XTERM; ;}
+#line 396 "perly.y" /* yacc.c:1646  */
+    { parser->expect = XTERM; }
+
     break;
 
   case 45:
-#line 399 "perly.y"
+#line 399 "perly.y" /* yacc.c:1646  */
     {
-                         OP *initop = (ps[(4) - (13)].val.opval);
+                         OP *initop = (ps[-9].val.opval);
                          OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-                                     scalar((ps[(7) - (13)].val.opval)), 
(ps[(13) - (13)].val.opval), (ps[(11) - (13)].val.opval), (ps[(10) - 
(13)].val.ival));
+                                     scalar((ps[-6].val.opval)), 
(ps[0].val.opval), (ps[-2].val.opval), (ps[-3].val.ival));
                          if (initop) {
                              forop = op_prepend_elem(OP_LINESEQ, initop,
                                  op_append_elem(OP_LINESEQ,
@@ -400,334 +443,383 @@ case 2:
                                      forop));
                          }
                          PL_hints |= HINT_BLOCK_SCOPE;
-                         (yyval.opval) = block_end((ps[(3) - (13)].val.ival), 
forop);
-                         parser->copline = (line_t)(ps[(1) - (13)].val.ival);
-                       ;}
+                         (yyval.opval) = block_end((ps[-10].val.ival), forop);
+                         parser->copline = (line_t)(ps[-12].val.ival);
+                       }
+
     break;
 
   case 46:
-#line 414 "perly.y"
+#line 414 "perly.y" /* yacc.c:1646  */
     {
-                         (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);
-                       ;}
+                         (yyval.opval) = block_end((ps[-6].val.ival), 
newFOROP(0, (ps[-5].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), 
(ps[0].val.opval)));
+                         parser->copline = (line_t)(ps[-8].val.ival);
+                       }
+
     break;
 
   case 47:
-#line 419 "perly.y"
+#line 419 "perly.y" /* yacc.c:1646  */
     {
-                         (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)));
-                         parser->copline = (line_t)(ps[(1) - (8)].val.ival);
-                       ;}
+                         (yyval.opval) = block_end((ps[-4].val.ival), 
newFOROP(0,
+                                     op_lvalue((ps[-6].val.opval), 
OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
+                         parser->copline = (line_t)(ps[-7].val.ival);
+                       }
+
     break;
 
   case 48:
-#line 425 "perly.y"
-    { parser->in_my = 0; (yyval.opval) = my((ps[(4) - (4)].val.opval)); ;}
+#line 425 "perly.y" /* yacc.c:1646  */
+    { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
+
     break;
 
   case 49:
-#line 427 "perly.y"
+#line 427 "perly.y" /* yacc.c:1646  */
     {
                          (yyval.opval) = block_end(
-                               (ps[(3) - (10)].val.ival),
+                               (ps[-7].val.ival),
                                newFOROP(0,
                                         op_lvalue(
                                            newUNOP(OP_REFGEN, 0,
-                                                   (ps[(5) - (10)].val.opval)),
+                                                   (ps[-5].val.opval)),
                                            OP_ENTERLOOP),
-                                        (ps[(7) - (10)].val.opval), (ps[(9) - 
(10)].val.opval), (ps[(10) - (10)].val.opval))
+                                        (ps[-3].val.opval), 
(ps[-1].val.opval), (ps[0].val.opval))
                          );
-                         parser->copline = (line_t)(ps[(1) - (10)].val.ival);
-                       ;}
+                         parser->copline = (line_t)(ps[-9].val.ival);
+                       }
+
     break;
 
   case 50:
-#line 440 "perly.y"
+#line 440 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = block_end((ps[(5) - (9)].val.ival), 
newFOROP(
+                         (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(
                                0, op_lvalue(newUNOP(OP_REFGEN, 0,
-                                                    (ps[(3) - (9)].val.opval)),
-                                            OP_ENTERLOOP), (ps[(6) - 
(9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval)));
-                         parser->copline = (line_t)(ps[(1) - (9)].val.ival);
-                       ;}
+                                                    (ps[-6].val.opval)),
+                                            OP_ENTERLOOP), (ps[-3].val.opval), 
(ps[-1].val.opval), (ps[0].val.opval)));
+                         parser->copline = (line_t)(ps[-8].val.ival);
+                       }
+
     break;
 
   case 51:
-#line 448 "perly.y"
+#line 448 "perly.y" /* yacc.c:1646  */
     {
-                         (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)));
-                         parser->copline = (line_t)(ps[(1) - (7)].val.ival);
-                       ;}
+                         (yyval.opval) = block_end((ps[-4].val.ival),
+                                 newFOROP(0, (OP*)NULL, (ps[-3].val.opval), 
(ps[-1].val.opval), (ps[0].val.opval)));
+                         parser->copline = (line_t)(ps[-6].val.ival);
+                       }
+
     break;
 
   case 52:
-#line 454 "perly.y"
+#line 454 "perly.y" /* yacc.c:1646  */
     {
                          /* 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);
-                       ;}
+                                 (OP*)NULL, (ps[-1].val.opval), 
(ps[0].val.opval), 0);
+                       }
+
     break;
 
   case 53:
-#line 460 "perly.y"
+#line 460 "perly.y" /* yacc.c:1646  */
     {
-                         package((ps[(3) - (5)].val.opval));
-                         if ((ps[(2) - (5)].val.opval)) {
-                             package_version((ps[(2) - (5)].val.opval));
+                         package((ps[-2].val.opval));
+                         if ((ps[-3].val.opval)) {
+                             package_version((ps[-3].val.opval));
                          }
-                       ;}
+                       }
+
     break;
 
   case 54:
-#line 467 "perly.y"
+#line 467 "perly.y" /* yacc.c:1646  */
     {
                          /* a block is a loop that happens once */
                          (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-                                 (OP*)NULL, block_end((ps[(5) - 
(8)].val.ival), (ps[(7) - (8)].val.opval)), (OP*)NULL, 0);
-                         if (parser->copline > (line_t)(ps[(4) - 
(8)].val.ival))
-                             parser->copline = (line_t)(ps[(4) - 
(8)].val.ival);
-                       ;}
+                                 (OP*)NULL, block_end((ps[-3].val.ival), 
(ps[-1].val.opval)), (OP*)NULL, 0);
+                         if (parser->copline > (line_t)(ps[-4].val.ival))
+                             parser->copline = (line_t)(ps[-4].val.ival);
+                       }
+
     break;
 
   case 55:
-#line 475 "perly.y"
+#line 475 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = (ps[(1) - (2)].val.opval);
-                       ;}
+                         (yyval.opval) = (ps[-1].val.opval);
+                       }
+
     break;
 
   case 56:
-#line 479 "perly.y"
+#line 479 "perly.y" /* yacc.c:1646  */
     {
                          (yyval.opval) = (OP*)NULL;
                          parser->copline = NOLINE;
-                       ;}
+                       }
+
     break;
 
   case 57:
-#line 487 "perly.y"
+#line 487 "perly.y" /* yacc.c:1646  */
     { OP *list;
-                         if ((ps[(2) - (2)].val.opval)) {
-                             OP *term = (ps[(2) - (2)].val.opval);
-                             list = op_append_elem(OP_LIST, (ps[(1) - 
(2)].val.opval), term);
+                         if ((ps[0].val.opval)) {
+                             OP *term = (ps[0].val.opval);
+                             list = op_append_elem(OP_LIST, 
(ps[-1].val.opval), term);
                          }
                          else {
-                             list = (ps[(1) - (2)].val.opval);
+                             list = (ps[-1].val.opval);
                          }
                          if (parser->copline == NOLINE)
                               parser->copline = CopLINE(PL_curcop)-1;
                          else parser->copline--;
                          (yyval.opval) = newSTATEOP(0, NULL,
                                          op_convert_list(OP_FORMLINE, 0, 
list));
-                       ;}
+                       }
+
     break;
 
   case 58:
-#line 504 "perly.y"
-    { (yyval.opval) = NULL; ;}
+#line 504 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = NULL; }
+
     break;
 
   case 59:
-#line 506 "perly.y"
-    { (yyval.opval) = op_unscope((ps[(2) - (3)].val.opval)); ;}
+#line 506 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = op_unscope((ps[-1].val.opval)); }
+
     break;
 
   case 60:
-#line 511 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 511 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 61:
-#line 513 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 513 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 62:
-#line 515 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - 
(3)].val.opval)); ;}
+#line 515 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), 
(ps[-2].val.opval)); }
+
     break;
 
   case 63:
-#line 517 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - 
(3)].val.opval)); ;}
+#line 517 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), 
(ps[-2].val.opval)); }
+
     break;
 
   case 64:
-#line 519 "perly.y"
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - 
(3)].val.opval)), (ps[(1) - (3)].val.opval)); ;}
+#line 519 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), 
(ps[-2].val.opval)); }
+
     break;
 
   case 65:
-#line 521 "perly.y"
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), 
(ps[(1) - (3)].val.opval)); ;}
+#line 521 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), 
(ps[-2].val.opval)); }
+
     break;
 
   case 66:
-#line 523 "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); ;}
+#line 523 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[0].val.opval), 
(ps[-2].val.opval), (OP*)NULL);
+                         parser->copline = (line_t)(ps[-1].val.ival); }
+
     break;
 
   case 67:
-#line 526 "perly.y"
-    { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - 
(3)].val.opval))); ;}
+#line 526 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newWHENOP((ps[0].val.opval), 
op_scope((ps[-2].val.opval))); }
+
     break;
 
   case 68:
-#line 531 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 531 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 69:
-#line 533 "perly.y"
+#line 533 "perly.y" /* yacc.c:1646  */
     {
-                         ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS;
-                         (yyval.opval) = op_scope((ps[(2) - (2)].val.opval));
-                       ;}
+                         ((ps[0].val.opval))->op_flags |= OPf_PARENS;
+                         (yyval.opval) = op_scope((ps[0].val.opval));
+                       }
+
     break;
 
   case 70:
-#line 538 "perly.y"
-    { parser->copline = (line_t)(ps[(1) - (6)].val.ival);
+#line 538 "perly.y" /* yacc.c:1646  */
+    { parser->copline = (line_t)(ps[-5].val.ival);
                            (yyval.opval) = newCONDOP(0,
-                               newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - 
(6)].val.opval)),
-                               op_scope((ps[(5) - (6)].val.opval)), (ps[(6) - 
(6)].val.opval));
+                               newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)),
+                               op_scope((ps[-1].val.opval)), 
(ps[0].val.opval));
                          PL_hints |= HINT_BLOCK_SCOPE;
-                       ;}
+                       }
+
     break;
 
   case 71:
-#line 548 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 548 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 72:
-#line 550 "perly.y"
-    { (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); ;}
+#line 550 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = op_scope((ps[0].val.opval)); }
+
     break;
 
   case 73:
-#line 555 "perly.y"
+#line 555 "perly.y" /* yacc.c:1646  */
     { (yyval.ival) = (PL_min_intro_pending &&
                            PL_max_intro_pending >=  PL_min_intro_pending);
-                         intro_my(); ;}
+                         intro_my(); }
+
     break;
 
   case 74:
-#line 561 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 561 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 76:
-#line 567 "perly.y"
+#line 567 "perly.y" /* yacc.c:1646  */
     { YYSTYPE tmplval;
                          (void)scan_num("1", &tmplval);
-                         (yyval.opval) = tmplval.opval; ;}
+                         (yyval.opval) = tmplval.opval; }
+
     break;
 
   case 78:
-#line 575 "perly.y"
-    { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
+#line 575 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = invert(scalar((ps[0].val.opval))); }
+
     break;
 
   case 79:
-#line 580 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
+#line 580 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); intro_my(); }
+
     break;
 
   case 80:
-#line 584 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
+#line 584 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); intro_my(); }
+
     break;
 
   case 81:
-#line 587 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 587 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 82:
-#line 588 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 588 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 83:
-#line 592 "perly.y"
+#line 592 "perly.y" /* yacc.c:1646  */
     { (yyval.ival) = start_subparse(FALSE, 0);
-                           SAVEFREESV(PL_compcv); ;}
+                           SAVEFREESV(PL_compcv); }
+
     break;
 
   case 84:
-#line 598 "perly.y"
+#line 598 "perly.y" /* yacc.c:1646  */
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
-                           SAVEFREESV(PL_compcv); ;}
+                           SAVEFREESV(PL_compcv); }
+
     break;
 
   case 85:
-#line 603 "perly.y"
+#line 603 "perly.y" /* yacc.c:1646  */
     { (yyval.ival) = start_subparse(TRUE, 0);
-                           SAVEFREESV(PL_compcv); ;}
+                           SAVEFREESV(PL_compcv); }
+
     break;
 
   case 88:
-#line 614 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 614 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 90:
-#line 620 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 620 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 91:
-#line 622 "perly.y"
-    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
+#line 622 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 92:
-#line 624 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 624 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 93:
-#line 629 "perly.y"
-    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
+#line 629 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 94:
-#line 631 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 631 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 95:
-#line 642 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 642 "perly.y" /* yacc.c:1646  */
+    { parser->in_my = 0; (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 96:
-#line 644 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 644 "perly.y" /* yacc.c:1646  */
+    { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 97:
-#line 649 "perly.y"
-    { (yyval.ival) = '@'; ;}
+#line 649 "perly.y" /* yacc.c:1646  */
+    { (yyval.ival) = '@'; }
+
     break;
 
   case 98:
-#line 651 "perly.y"
-    { (yyval.ival) = '%'; ;}
+#line 651 "perly.y" /* yacc.c:1646  */
+    { (yyval.ival) = '%'; }
+
     break;
 
   case 99:
-#line 655 "perly.y"
+#line 655 "perly.y" /* yacc.c:1646  */
     {
-                            I32 sigil   = (ps[(1) - (3)].val.ival);
-                            OP *var     = (ps[(2) - (3)].val.opval);
-                            OP *defexpr = (ps[(3) - (3)].val.opval);
+                            I32 sigil   = (ps[-2].val.ival);
+                            OP *var     = (ps[-1].val.opval);
+                            OP *defexpr = (ps[0].val.opval);
 
                             if (parser->sig_slurpy)
                                 yyerror("Multiple slurpy parameters not 
allowed");
@@ -738,29 +830,33 @@ case 2:
                                         "a default value");
 
                             (yyval.opval) = var ? newSTATEOP(0, NULL, var) : 
(OP*)NULL;
-                        ;}
+                        }
+
     break;
 
   case 100:
-#line 674 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 674 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 101:
-#line 676 "perly.y"
-    { (yyval.opval) = newOP(OP_NULL, 0); ;}
+#line 676 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newOP(OP_NULL, 0); }
+
     break;
 
   case 102:
-#line 678 "perly.y"
-    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
+#line 678 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 103:
-#line 684 "perly.y"
+#line 684 "perly.y" /* yacc.c:1646  */
     {
-                            OP *var     = (ps[(2) - (3)].val.opval);
-                            OP *defexpr = (ps[(3) - (3)].val.opval);
+                            OP *var     = (ps[-1].val.opval);
+                            OP *defexpr = (ps[0].val.opval);
 
                             if (parser->sig_slurpy)
                                 yyerror("Slurpy parameter not last");
@@ -817,48 +913,56 @@ case 2:
                             }
 
                             (yyval.opval) = var ? newSTATEOP(0, NULL, var) : 
(OP*)NULL;
-                        ;}
+                        }
+
     break;
 
   case 104:
-#line 749 "perly.y"
-    { parser->expect = XSIGVAR; (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 749 "perly.y" /* yacc.c:1646  */
+    { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 105:
-#line 751 "perly.y"
-    { parser->expect = XSIGVAR; (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 751 "perly.y" /* yacc.c:1646  */
+    { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 106:
-#line 757 "perly.y"
-    { (yyval.opval) = (ps[(1) - (2)].val.opval); ;}
+#line 757 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[-1].val.opval); }
+
     break;
 
   case 107:
-#line 759 "perly.y"
+#line 759 "perly.y" /* yacc.c:1646  */
     {
-                         (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - 
(3)].val.opval), (ps[(3) - (3)].val.opval));
-                       ;}
+                         (yyval.opval) = op_append_list(OP_LINESEQ, 
(ps[-2].val.opval), (ps[0].val.opval));
+                       }
+
     break;
 
   case 108:
-#line 763 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 763 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 109:
-#line 768 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 768 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 110:
-#line 770 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 770 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 111:
-#line 774 "perly.y"
+#line 774 "perly.y" /* yacc.c:1646  */
     {
                             ENTER;
                             SAVEIV(parser->sig_elems);
@@ -867,14 +971,15 @@ case 2:
                             parser->sig_elems    = 0;
                             parser->sig_optelems = 0;
                             parser->sig_slurpy   = 0;
-                            parser->expect = XSIGVAR;
-                        ;}
+                            parser->in_my        = KEY_sigvar;
+                        }
+
     break;
 
   case 112:
-#line 786 "perly.y"
+#line 786 "perly.y" /* yacc.c:1646  */
     {
-                            OP            *sigops = (ps[(3) - (4)].val.opval);
+                            OP            *sigops = (ps[-1].val.opval);
                             UNOP_AUX_item *aux;
                             OP            *check;
 
@@ -901,312 +1006,364 @@ case 2:
                                                 sigops,
                                                 newSTATEOP(0, NULL, NULL));
 
+                            parser->in_my = 0;
                             parser->expect = XATTRBLOCK;
                             LEAVE;
-                       ;}
+                       }
+
     break;
 
   case 114:
-#line 823 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 824 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (OP*)NULL; }
+
     break;
 
   case 115:
-#line 828 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - 
(3)].val.opval)); ;}
+#line 829 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), 
(ps[0].val.opval)); }
+
     break;
 
   case 116:
-#line 830 "perly.y"
-    { (yyval.opval) = newLOGOP((ps[(2) - (3)].val.ival), 0, (ps[(1) - 
(3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
+#line 831 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), 
(ps[0].val.opval)); }
+
     break;
 
   case 117:
-#line 832 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - 
(3)].val.opval)); ;}
+#line 833 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), 
(ps[0].val.opval)); }
+
     break;
 
   case 119:
-#line 838 "perly.y"
-    { (yyval.opval) = (ps[(1) - (2)].val.opval); ;}
+#line 839 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[-1].val.opval); }
+
     break;
 
   case 120:
-#line 840 "perly.y"
+#line 841 "perly.y" /* yacc.c:1646  */
     {
-                         OP* term = (ps[(3) - (3)].val.opval);
-                         (yyval.opval) = op_append_elem(OP_LIST, (ps[(1) - 
(3)].val.opval), term);
-                       ;}
+                         OP* term = (ps[0].val.opval);
+                         (yyval.opval) = op_append_elem(OP_LIST, 
(ps[-2].val.opval), term);
+                       }
+
     break;
 
   case 122:
-#line 849 "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)) );
-                       ;}
+#line 850 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = op_convert_list((ps[-2].val.ival), OPf_STACKED,
+                               op_prepend_elem(OP_LIST, 
newGVREF((ps[-2].val.ival),(ps[-1].val.opval)), (ps[0].val.opval)) );
+                       }
+
     break;
 
   case 123:
-#line 853 "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)) );
-                       ;}
+#line 854 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = op_convert_list((ps[-4].val.ival), OPf_STACKED,
+                               op_prepend_elem(OP_LIST, 
newGVREF((ps[-4].val.ival),(ps[-2].val.opval)), (ps[-1].val.opval)) );
+                       }
+
     break;
 
   case 124:
-#line 857 "perly.y"
+#line 858 "perly.y" /* yacc.c:1646  */
     { (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)),
-                                   newMETHOP(OP_METHOD, 0, (ps[(3) - 
(6)].val.opval))));
-                       ;}
+                                   op_prepend_elem(OP_LIST, 
scalar((ps[-5].val.opval)), (ps[-1].val.opval)),
+                                   newMETHOP(OP_METHOD, 0, 
(ps[-3].val.opval))));
+                       }
+
     break;
 
   case 125:
-#line 863 "perly.y"
+#line 864 "perly.y" /* yacc.c:1646  */
     { (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))));
-                       ;}
+                               op_append_elem(OP_LIST, 
scalar((ps[-2].val.opval)),
+                                   newMETHOP(OP_METHOD, 0, 
(ps[0].val.opval))));
+                       }
+
     break;
 
   case 126:
-#line 868 "perly.y"
+#line 869 "perly.y" /* yacc.c:1646  */
     { (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)),
-                                   newMETHOP(OP_METHOD, 0, (ps[(1) - 
(3)].val.opval))));
-                       ;}
+                                   op_prepend_elem(OP_LIST, 
(ps[-1].val.opval), (ps[0].val.opval)),
+                                   newMETHOP(OP_METHOD, 0, 
(ps[-2].val.opval))));
+                       }
+
     break;
 
   case 127:
-#line 874 "perly.y"
+#line 875 "perly.y" /* yacc.c:1646  */
     { (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)),
-                                   newMETHOP(OP_METHOD, 0, (ps[(1) - 
(5)].val.opval))));
-                       ;}
+                                   op_prepend_elem(OP_LIST, 
(ps[-3].val.opval), (ps[-1].val.opval)),
+                                   newMETHOP(OP_METHOD, 0, 
(ps[-4].val.opval))));
+                       }
+
     break;
 
   case 128:
-#line 880 "perly.y"
-    { (yyval.opval) = op_convert_list((ps[(1) - (2)].val.ival), 0, (ps[(2) - 
(2)].val.opval)); ;}
+#line 881 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, 
(ps[0].val.opval)); }
+
     break;
 
   case 129:
-#line 882 "perly.y"
-    { (yyval.opval) = op_convert_list((ps[(1) - (4)].val.ival), 0, (ps[(3) - 
(4)].val.opval)); ;}
+#line 883 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, 
(ps[-1].val.opval)); }
+
     break;
 
   case 130:
-#line 884 "perly.y"
+#line 885 "perly.y" /* yacc.c:1646  */
     { 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[-1].val.ival), 0, 
(OP*)NULL, (ps[0].val.opval)); }
+
     break;
 
   case 131:
-#line 887 "perly.y"
+#line 888 "perly.y" /* yacc.c:1646  */
     { (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)));
-                       ;}
+                                  op_prepend_elem(OP_LIST, (ps[-1].val.opval), 
(ps[0].val.opval)), (ps[-4].val.opval)));
+                       }
+
     break;
 
   case 134:
-#line 902 "perly.y"
-    { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), 
scalar((ps[(3) - (5)].val.opval))); ;}
+#line 903 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), 
scalar((ps[-2].val.opval))); }
+
     break;
 
   case 135:
-#line 904 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), 
scalar((ps[(3) - (4)].val.opval)));
-                       ;}
+#line 905 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), 
scalar((ps[-1].val.opval)));
+                       }
+
     break;
 
   case 136:
-#line 907 "perly.y"
+#line 908 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
-                                       ref(newAVREF((ps[(1) - 
(5)].val.opval)),OP_RV2AV),
-                                       scalar((ps[(4) - (5)].val.opval)));
-                       ;}
+                                       
ref(newAVREF((ps[-4].val.opval)),OP_RV2AV),
+                                       scalar((ps[-1].val.opval)));
+                       }
+
     break;
 
   case 137:
-#line 912 "perly.y"
+#line 913 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
-                                       ref(newAVREF((ps[(1) - 
(4)].val.opval)),OP_RV2AV),
-                                       scalar((ps[(3) - (4)].val.opval)));
-                       ;}
+                                       
ref(newAVREF((ps[-3].val.opval)),OP_RV2AV),
+                                       scalar((ps[-1].val.opval)));
+                       }
+
     break;
 
   case 138:
-#line 917 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), 
jmaybe((ps[(3) - (5)].val.opval)));
-                       ;}
+#line 918 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), 
jmaybe((ps[-2].val.opval)));
+                       }
+
     break;
 
   case 139:
-#line 920 "perly.y"
+#line 921 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
-                                       ref(newHVREF((ps[(1) - 
(6)].val.opval)),OP_RV2HV),
-                                       jmaybe((ps[(4) - (6)].val.opval))); ;}
+                                       
ref(newHVREF((ps[-5].val.opval)),OP_RV2HV),
+                                       jmaybe((ps[-2].val.opval))); }
+
     break;
 
   case 140:
-#line 924 "perly.y"
+#line 925 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
-                                       ref(newHVREF((ps[(1) - 
(5)].val.opval)),OP_RV2HV),
-                                       jmaybe((ps[(3) - (5)].val.opval))); ;}
+                                       
ref(newHVREF((ps[-4].val.opval)),OP_RV2HV),
+                                       jmaybe((ps[-2].val.opval))); }
+
     break;
 
   case 141:
-#line 928 "perly.y"
+#line 929 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                                  newCVREF(0, scalar((ps[(1) - 
(4)].val.opval)))); ;}
+                                  newCVREF(0, scalar((ps[-3].val.opval)))); }
+
     break;
 
   case 142:
-#line 931 "perly.y"
+#line 932 "perly.y" /* yacc.c:1646  */
     { (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))))); ;}
+                                  op_append_elem(OP_LIST, (ps[-1].val.opval),
+                                      newCVREF(0, 
scalar((ps[-4].val.opval))))); }
+
     break;
 
   case 143:
-#line 936 "perly.y"
+#line 937 "perly.y" /* yacc.c:1646  */
     { (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))))); ;}
+                                  op_append_elem(OP_LIST, (ps[-1].val.opval),
+                                              newCVREF(0, 
scalar((ps[-3].val.opval))))); }
+
     break;
 
   case 144:
-#line 940 "perly.y"
+#line 941 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                                  newCVREF(0, scalar((ps[(1) - 
(3)].val.opval)))); ;}
+                                  newCVREF(0, scalar((ps[-2].val.opval)))); }
+
     break;
 
   case 145:
-#line 943 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - 
(6)].val.opval)); ;}
+#line 944 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); }
+
     break;
 
   case 146:
-#line 945 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - 
(4)].val.opval)); ;}
+#line 946 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); }
+
     break;
 
   case 147:
-#line 947 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL); ;}
+#line 948 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (OP*)NULL); }
+
     break;
 
   case 148:
-#line 952 "perly.y"
-    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), 
(ps[(2) - (3)].val.ival), (ps[(3) - (3)].val.opval)); ;}
+#line 953 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), 
(ps[-1].val.ival), (ps[0].val.opval)); }
+
     break;
 
   case 149:
-#line 954 "perly.y"
-    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - 
(3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
+#line 955 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, 
scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+
     break;
 
   case 150:
-#line 956 "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)));
-                       ;}
+#line 957 "perly.y" /* yacc.c:1646  */
+    {   if ((ps[-1].val.ival) != OP_REPEAT)
+                               scalar((ps[-2].val.opval));
+                           (yyval.opval) = newBINOP((ps[-1].val.ival), 0, 
(ps[-2].val.opval), scalar((ps[0].val.opval)));
+                       }
+
     break;
 
   case 151:
-#line 961 "perly.y"
-    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - 
(3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
+#line 962 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, 
scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+
     break;
 
   case 152:
-#line 963 "perly.y"
-    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - 
(3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
+#line 964 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, 
scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+
     break;
 
   case 153:
-#line 965 "perly.y"
-    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - 
(3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
+#line 966 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, 
scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+
     break;
 
   case 154:
-#line 967 "perly.y"
-    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - 
(3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
+#line 968 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, 
scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+
     break;
 
   case 155:
-#line 969 "perly.y"
-    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - 
(3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
+#line 970 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, 
scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+
     break;
 
   case 156:
-#line 971 "perly.y"
-    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - 
(3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
+#line 972 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, 
scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+
     break;
 
   case 157:
-#line 973 "perly.y"
-    { (yyval.opval) = newRANGE((ps[(2) - (3)].val.ival), scalar((ps[(1) - 
(3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
+#line 974 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), 
scalar((ps[0].val.opval))); }
+
     break;
 
   case 158:
-#line 975 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - 
(3)].val.opval)); ;}
+#line 976 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), 
(ps[0].val.opval)); }
+
     break;
 
   case 159:
-#line 977 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - 
(3)].val.opval)); ;}
+#line 978 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), 
(ps[0].val.opval)); }
+
     break;
 
   case 160:
-#line 979 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - 
(3)].val.opval)); ;}
+#line 980 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), 
(ps[0].val.opval)); }
+
     break;
 
   case 161:
-#line 981 "perly.y"
-    { (yyval.opval) = bind_match((ps[(2) - (3)].val.ival), (ps[(1) - 
(3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
+#line 982 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), 
(ps[0].val.opval)); }
+
     break;
 
   case 162:
-#line 986 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - 
(2)].val.opval))); ;}
+#line 987 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }
+
     break;
 
   case 163:
-#line 988 "perly.y"
-    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
+#line 989 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 164:
-#line 991 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); ;}
+#line 992 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
+
     break;
 
   case 165:
-#line 993 "perly.y"
-    { (yyval.opval) = newUNOP((ps[(1) - (2)].val.ival), 0, scalar((ps[(2) - 
(2)].val.opval))); ;}
+#line 994 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, 
scalar((ps[0].val.opval))); }
+
     break;
 
   case 166:
-#line 995 "perly.y"
+#line 996 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
-                                       op_lvalue(scalar((ps[(1) - 
(2)].val.opval)), OP_POSTINC)); ;}
+                                       op_lvalue(scalar((ps[-1].val.opval)), 
OP_POSTINC)); }
+
     break;
 
   case 167:
-#line 998 "perly.y"
+#line 999 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
-                                       op_lvalue(scalar((ps[(1) - 
(2)].val.opval)), OP_POSTDEC));;}
+                                       op_lvalue(scalar((ps[-1].val.opval)), 
OP_POSTDEC));}
+
     break;
 
   case 168:
-#line 1001 "perly.y"
+#line 1002 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = op_convert_list(OP_JOIN, 0,
                                       op_append_elem(
                                        OP_LIST,
@@ -1214,523 +1371,610 @@ case 2:
                                            newSVOP(OP_CONST,0,
                                                    newSVpvs("\""))
                                        )),
-                                       (ps[(1) - (2)].val.opval)
+                                       (ps[-1].val.opval)
                                       ));
-                       ;}
+                       }
+
     break;
 
   case 169:
-#line 1012 "perly.y"
+#line 1013 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
-                                       op_lvalue(scalar((ps[(2) - 
(2)].val.opval)), OP_PREINC)); ;}
+                                       op_lvalue(scalar((ps[0].val.opval)), 
OP_PREINC)); }
+
     break;
 
   case 170:
-#line 1015 "perly.y"
+#line 1016 "perly.y" /* yacc.c:1646  */
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
-                                       op_lvalue(scalar((ps[(2) - 
(2)].val.opval)), OP_PREDEC)); ;}
+                                       op_lvalue(scalar((ps[0].val.opval)), 
OP_PREDEC)); }
+
     break;
 
   case 171:
-#line 1022 "perly.y"
-    { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval)); ;}
+#line 1023 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
+
     break;
 
   case 172:
-#line 1024 "perly.y"
-    { (yyval.opval) = newANONLIST((OP*)NULL);;}
+#line 1025 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newANONLIST((OP*)NULL);}
+
     break;
 
   case 173:
-#line 1026 "perly.y"
-    { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval)); ;}
+#line 1027 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
+
     break;
 
   case 174:
-#line 1028 "perly.y"
-    { (yyval.opval) = newANONHASH((OP*)NULL); ;}
+#line 1029 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newANONHASH((OP*)NULL); }
+
     break;
 
   case 175:
-#line 1030 "perly.y"
+#line 1031 "perly.y" /* yacc.c:1646  */
     { 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)); ;}
+                         (yyval.opval) = newANONATTRSUB((ps[-3].val.ival), 
(ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)); }
+
     break;
 
   case 176:
-#line 1033 "perly.y"
+#line 1034 "perly.y" /* yacc.c:1646  */
     {
                          OP *body;
-                         if (parser->copline > (line_t)(ps[(6) - 
(8)].val.ival))
-                             parser->copline = (line_t)(ps[(6) - 
(8)].val.ival);
-                         body = block_end((ps[(3) - (8)].val.ival),
-                               op_append_list(OP_LINESEQ, (ps[(4) - 
(8)].val.opval), (ps[(7) - (8)].val.opval)));
+                         if (parser->copline > (line_t)(ps[-2].val.ival))
+                             parser->copline = (line_t)(ps[-2].val.ival);
+                         body = block_end((ps[-5].val.ival),
+                               op_append_list(OP_LINESEQ, (ps[-4].val.opval), 
(ps[-1].val.opval)));
                          SvREFCNT_inc_simple_void(PL_compcv);
-                         (yyval.opval) = newANONATTRSUB((ps[(2) - 
(8)].val.ival), NULL, (ps[(5) - (8)].val.opval), body);
-                       ;}
+                         (yyval.opval) = newANONATTRSUB((ps[-6].val.ival), 
NULL, (ps[-3].val.opval), body);
+                       }
+
     break;
 
   case 177:
-#line 1047 "perly.y"
-    { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), (ps[(1) - 
(2)].val.ival));;}
+#line 1048 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
+
     break;
 
   case 178:
-#line 1049 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - 
(2)].val.opval)));;}
+#line 1050 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, 
op_scope((ps[0].val.opval)));}
+
     break;
 
   case 183:
-#line 1057 "perly.y"
-    { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - 
(5)].val.opval), (ps[(5) - (5)].val.opval)); ;}
+#line 1058 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), 
(ps[0].val.opval)); }
+
     break;
 
   case 184:
-#line 1059 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[(2) - (2)].val.opval)); ;}
+#line 1060 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
+
     break;
 
   case 185:
-#line 1061 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[(3) - 
(3)].val.opval),1)); ;}
+#line 1062 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
+
     break;
 
   case 186:
-#line 1063 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1064 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 187:
-#line 1065 "perly.y"
-    { (yyval.opval) = localize((ps[(2) - (2)].val.opval),0); ;}
+#line 1066 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = localize((ps[0].val.opval),0); }
+
     break;
 
   case 188:
-#line 1067 "perly.y"
-    { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;}
+#line 1068 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = sawparens((ps[-1].val.opval)); }
+
     break;
 
   case 189:
-#line 1069 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1070 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 190:
-#line 1071 "perly.y"
-    { (yyval.opval) = sawparens(newNULLLIST()); ;}
+#line 1072 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = sawparens(newNULLLIST()); }
+
     break;
 
   case 191:
-#line 1073 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1074 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 192:
-#line 1075 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1076 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 193:
-#line 1077 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1078 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 194:
-#line 1079 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1080 "perly.y" /* yacc.c:1646  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
     break;
 
   case 195:
-#line 1081 "perly.y"
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), 
OP_AV2ARYLEN));;}
+#line 1082 "perly.y" /* yacc.c:1646  */
**** PATCH TRUNCATED AT 2000 LINES -- 2922 NOT SHOWN ****

--
Perl5 Master Repository

Reply via email to