put signature ops in their own subtree.

The following code:

    sub f ($x,$y) {
        study;
    }

used to compile as:

    a  <1> leavesub[1 ref] K/REFC,1 ->(end)
    -     <@> lineseq KP ->a
    1        <;> nextstate(main 5 p:5) v:%,fea=7 ->2
    2        <+> argcheck(2,0) v ->3
    3        <;> nextstate(main 3 p:5) v:%,fea=7 ->4
    4        <+> argelem(0)[$x:3,5] v/SV ->5
    5        <;> nextstate(main 4 p:5) v:%,fea=7 ->6
    6        <+> argelem(1)[$y:4,5] v/SV ->7
    -        <;> ex-nextstate(main 5 p:5) v:%,fea=7 ->7
    7        <;> nextstate(main 5 p:6) v:%,fea=7 ->8
    9        <1> study sK/1 ->a
    -           <1> ex-rv2sv sK/1 ->9
    8              <$> gvsv(*_) s ->9

Following this commit, it compiles as:

    a  <1> leavesub[1 ref] K/REFC,1 ->(end)
    -     <@> lineseq KP ->a
    -        <1> ex-argcheck vK/1 ->7
    -           <@> lineseq vK ->-
    1              <;> nextstate(main 5 p:5) v:%,fea=7 ->2
    2              <+> argcheck(2,0) v ->3
    3              <;> nextstate(main 3 p:5) v:%,fea=7 ->4
    4              <+> argelem(0)[$x:3,5] v/SV ->5
    5              <;> nextstate(main 4 p:5) v:%,fea=7 ->6
    6              <+> argelem(1)[$y:4,5] v/SV ->7
    -              <;> ex-nextstate(main 5 p:5) v:%,fea=7 ->-
    7        <;> nextstate(main 5 p:6) v:%,fea=7 ->8
    9        <1> study sK/1 ->a
    -           <1> ex-rv2sv sK/1 ->9
    8              <#> gvsv[*_] s ->9

All the ops associated with the signature have been put in their own
subtree, with an extra NULL ex-argcheck op "on top". The op on top
serves two purposes: first, it makes it easier for Deparse.pm etc to
spot siganure code; secondly, it may at some point in the future be
upgraded to OP_SIGNATURE when signatures get optimised. It's of type
ex-argcheck only because when being created it needs to be an op type
that's in class UNOP_AUX so that the created op will be suitable for
later optimising, and making it an ex-type associated with signatures
helps flag it as such.

There should be no functional changes apart from the shape of the
optree.

diff --git a/ext/XS-APItest/APItest.pm b/ext/XS-APItest/APItest.pm
index 49ad7c5..fdf5b85 100644 (file)
--- a/ext/XS-APItest/APItest.pm
+++ b/ext/XS-APItest/APItest.pm
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 
 require XSLoader;
 

diff --git a/ext/XS-APItest/APItest.xs b/ext/XS-APItest/APItest.xs
index d1ca8f9..cd58b52 100644 (file)
--- a/ext/XS-APItest/APItest.xs
+++ b/ext/XS-APItest/APItest.xs
@@ -1061,10 +1061,17 @@ static OP *THX_parse_keyword_subsignature(pTHX)
 
     /* We can't yield the optree as is to the caller because it won't be
      * executable outside of a called sub. We'll have to convert it into
-     * something safe for them to invoke
-     * sigop should be a OP_LINESEQ containing OP_NEXTSTATE-separated
-     * OP_ARGCHECK and OP_ARGELEMs
+     * something safe for them to invoke.
+     * sigop should be an OP_NULL above a OP_LINESEQ containing
+     * OP_NEXTSTATE-separated OP_ARGCHECK and OP_ARGELEMs
      */
+    if(sigop->op_type != OP_NULL)
+       croak("Expected parse_subsignature() to yield an OP_NULL");
+    
+    if(!(sigop->op_flags & OPf_KIDS))
+       croak("Expected parse_subsignature() to yield an OP_NULL with kids");
+    sigop = cUNOPx(sigop)->op_first;
+
     if(sigop->op_type != OP_LINESEQ)
        croak("Expected parse_subsignature() to yield an OP_LINESEQ");
 

diff --git a/ext/XS-APItest/t/subsignature.t b/ext/XS-APItest/t/subsignature.t
index f7d0e25..396fb02 100644 (file)
--- a/ext/XS-APItest/t/subsignature.t
+++ b/ext/XS-APItest/t/subsignature.t
@@ -18,6 +18,7 @@ eval q{
        push @t, (subsignature $one = 1);
 };
 is $@, "";
+use Data::Dumper; print Dumper \@t;
 is_deeply \@t, [
        ['nextstate:4', 'argcheck:2:0:-', 'argelem:$x', 'argelem:$y'],
        ['nextstate:5', 'argcheck:2:0:-', 'argelem:$z',],

diff --git a/lib/B/Deparse.pm b/lib/B/Deparse.pm
index d7dc060..bf5f29e 100644 (file)
--- a/lib/B/Deparse.pm
+++ b/lib/B/Deparse.pm
@@ -52,7 +52,7 @@ use B qw(class main_root main_start main_cv svref_2object opnumber perlstring
         MDEREF_SHIFT
     );
 
-$VERSION = '1.49';
+$VERSION = '1.50';
 use strict;
 our $AUTOLOAD;
 use warnings ();
@@ -271,7 +271,7 @@ BEGIN {
 
 
 BEGIN { for (qw[ const stringify rv2sv list glob pushmark null aelem
-                kvaslice kvhslice padsv
+                kvaslice kvhslice padsv argcheck
                  nextstate dbstate rv2av rv2hv helem custom ]) {
     eval "sub OP_\U$_ () { " . opnumber($_) . "}"
 }}
@@ -1176,42 +1176,68 @@ sub pad_subs {
 # or altered. In this case we return "()" and fall back to general
 # deparsing of the individual sigelems as 'my $x = $_[N]' etc.
 #
-# We're only called if the first two ops are nextstate and argcheck.
+# We're only called if the top is an ex-argcheck, which is a placeholder
+# indicating a signature subtree.
+#
+# Return a signature string, or an empty list if no deparseable as a
+# signature
 
 sub deparse_argops {
-    my ($self, $firstop, $cv) = @_;
+    my ($self, $topop, $cv) = @_;
 
     my @sig;
-    my $o = $firstop;
-    return if $o->label; #first nextstate;
+
+
+    $topop = $topop->first;
+    return unless $$topop and $topop->name eq 'lineseq';
+
+
+    # last op should be nextstate
+    my $last = $topop->last;
+    return unless $$last
+                    and (   _op_is_or_was($last, OP_NEXTSTATE)
+                         or _op_is_or_was($last, OP_DBSTATE));
+
+    # first OP_NEXTSTATE
+
+    my $o = $topop->first;
+    return unless $$o;
+    return if $o->label;
 
     # OP_ARGCHECK
 
     $o = $o->sibling;
+    return unless $$o and $o->name eq 'argcheck';
+
     my ($params, $opt_params, $slurpy) = $o->aux_list($cv);
     my $mandatory = $params - $opt_params;
     my $seen_slurpy = 0;
     my $last_ix = -1;
 
-    # keep looking for valid nextstate + argelem pairs
+    # keep looking for valid nextstate + argelem pairs, terminated
+    # by a final nextstate
 
     while (1) {
-        # OP_NEXTSTATE
         $o = $o->sibling;
-        last unless $$o;
-        last unless $o->name =~ /^(next|db)state$/;
-        last if $o->label;
+        return unless $$o;
+
+        # skip trailing nextstate
+        last if $$o == $$last;
+
+        # OP_NEXTSTATE
+        return unless $o->name =~ /^(next|db)state$/;
+        return if $o->label;
 
         # OP_ARGELEM
-        my $o2 = $o->sibling;
-        last unless $$o2;
+        $o = $o->sibling;
+        last unless $$o;
 
-        if ($o2->name eq 'argelem') {
-            my $ix  = $o2->string($cv);
+        if ($o->name eq 'argelem') {
+            my $ix  = $o->string($cv);
             while (++$last_ix < $ix) {
                 push @sig, $last_ix <  $mandatory ? '$' : '$=';
             }
-            my $var = $self->padname($o2->targ);
+            my $var = $self->padname($o->targ);
             if ($var =~ /^[@%]/) {
                 return if $seen_slurpy;
                 $seen_slurpy = 1;
@@ -1221,8 +1247,8 @@ sub deparse_argops {
             else {
                 return if $ix >= $params;
             }
-            if ($o2->flags & OPf_KIDS) {
-                my $kid = $o2->first;
+            if ($o->flags & OPf_KIDS) {
+                my $kid = $o->first;
                 return unless $$kid and $kid->name eq 'argdefelem';
                 my $def = $self->deparse($kid->first, 7);
                 $def = "($def)" if $kid->first->flags & OPf_PARENS;
@@ -1230,13 +1256,13 @@ sub deparse_argops {
             }
             push @sig, $var;
         }
-        elsif ($o2->name eq 'null'
-               and ($o2->flags & OPf_KIDS)
-               and $o2->first->name eq 'argdefelem')
+        elsif ($o->name eq 'null'
+               and ($o->flags & OPf_KIDS)
+               and $o->first->name eq 'argdefelem')
         {
             # special case - a void context default expression: $ = expr
 
-            my $defop = $o2->first;
+            my $defop = $o->first;
             my $ix = $defop->targ;
             while (++$last_ix < $ix) {
                 push @sig, $last_ix <  $mandatory ? '$' : '$=';
@@ -1248,10 +1274,9 @@ sub deparse_argops {
             push @sig, '$ = ' . $def;
         }
         else {
-            last;
+            return;
         }
 
-        $o = $o2;
     }
 
     while (++$last_ix < $params) {
@@ -1259,9 +1284,10 @@ sub deparse_argops {
     }
     push @sig, $slurpy if $slurpy and !$seen_slurpy;
 
-    return ($o, join(', ', @sig));
+    return (join(', ', @sig));
 }
 
+
 # Deparse a sub. Returns everything except the 'sub foo',
 # e.g.  ($$) : method { ...; }
 # or    : prototype($$) lvalue ($a, $b) { ...; };
@@ -1304,27 +1330,26 @@ Carp::confess("SPECIAL in deparse_sub") if $cv->isa("B::SPECIAL");
        $self->pad_subs($cv);
        $self->pessimise($root, $cv->START);
        my $lineseq = $root->first;
-       if ($lineseq->name eq "lineseq") {
-           my $firstop = $lineseq->first;
-
-            if ($has_sig) {
-                my $o2;
-                # try to deparse first few ops as a signature if possible
-                if (     $$firstop
-                     and $firstop->name =~  /^(next|db)state$/
-                     and (($o2 = $firstop->sibling))
-                     and $$o2)
-                {
-                    if ($o2->name eq 'argcheck') {
-                        my ($nexto, $mysig) = $self->deparse_argops($firstop, $cv);
-                        if (defined $nexto) {
-                            $firstop = $nexto;
-                            $sig = $mysig;
-                        }
-                    }
-                }
+
+        # stub sub may have single op rather than list of ops
+        my $is_list = ($lineseq->name eq "lineseq");
+        my $firstop = $is_list ? $lineseq->first : $lineseq;
+
+        # Try to deparse first subtree as a signature if possible.
+        # Top of signature subtree has an ex-argcheck as a placeholder
+        if (    $has_sig
+            and $$firstop
+            and $firstop->name eq 'null'
+            and $firstop->targ == OP_ARGCHECK
+        ) {
+            my ($mysig) = $self->deparse_argops($firstop, $cv);
+            if (defined $mysig) {
+                $sig = $mysig;
+                $firstop = $is_list ? $firstop->sibling : undef;
             }
+        }
 
+        if ($is_list && $firstop) {
             my @ops;
            for (my $o = $firstop; $$o; $o=$o->sibling) {
                push @ops, $o;
@@ -1341,9 +1366,12 @@ Carp::confess("SPECIAL in deparse_sub") if $cv->isa("B::SPECIAL");
                $body .= ";\n$subs" if length($subs);
            }
        }
-       else {
+       elsif ($firstop) {
            $body = $self->deparse($root->first, 0);
        }
+        else {
+            $body = ';'; # stub sub
+        }
 
         my $l = '';
         if ($self->{'linenums'}) {

diff --git a/perly.act b/perly.act
index dde06e3..1237b50 100644 (file)
--- a/perly.act
+++ b/perly.act
@@ -1025,9 +1025,18 @@ case 2:
                                                 sigops);
                             /* a nextstate at the end handles context
                              * correctly for an empty sub body */
-                            (yyval.opval) = op_append_elem(OP_LINESEQ,
+                            sigops = op_append_elem(OP_LINESEQ,
                                                 sigops,
                                                 newSTATEOP(0, NULL, NULL));
+                            /* wrap the list of arg ops in a NULL aux op.
+                              This serves two purposes. First, it makes
+                              the arg list a separate subtree from the
+                              body of the sub, and secondly the null op
+                              may in future be upgraded to an OP_SIGNATURE
+                              when implemented. For now leave it as
+                              ex-argcheck */
+                            (yyval.opval) = newUNOP_AUX(OP_ARGCHECK, 0, sigops, NULL);
+                            op_null((yyval.opval));
 
                             parser->in_my = 0;
                             /* tell the toker that attrributes can follow
@@ -1046,19 +1055,19 @@ case 2:
     break;
 
   case 119:
-#line 839 "perly.y" /* yacc.c:1648  */
+#line 848 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 120:
-#line 840 "perly.y" /* yacc.c:1648  */
+#line 849 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = NULL; }
 
     break;
 
   case 121:
-#line 846 "perly.y" /* yacc.c:1648  */
+#line 855 "perly.y" /* yacc.c:1648  */
     {
                          if (parser->copline > (line_t)(ps[-2].val.ival))
                              parser->copline = (line_t)(ps[-2].val.ival);
@@ -1068,19 +1077,19 @@ case 2:
     break;
 
   case 122:
-#line 856 "perly.y" /* yacc.c:1648  */
+#line 865 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 123:
-#line 857 "perly.y" /* yacc.c:1648  */
+#line 866 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = NULL; }
 
     break;
 
   case 124:
-#line 861 "perly.y" /* yacc.c:1648  */
+#line 870 "perly.y" /* yacc.c:1648  */
     {
                          if (parser->copline > (line_t)(ps[-2].val.ival))
                              parser->copline = (line_t)(ps[-2].val.ival);
@@ -1091,31 +1100,31 @@ case 2:
     break;
 
   case 125:
-#line 872 "perly.y" /* yacc.c:1648  */
+#line 881 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 126:
-#line 874 "perly.y" /* yacc.c:1648  */
+#line 883 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 127:
-#line 876 "perly.y" /* yacc.c:1648  */
+#line 885 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 129:
-#line 882 "perly.y" /* yacc.c:1648  */
+#line 891 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[-1].val.opval); }
 
     break;
 
   case 130:
-#line 884 "perly.y" /* yacc.c:1648  */
+#line 893 "perly.y" /* yacc.c:1648  */
     {
                          OP* term = (ps[0].val.opval);
                          (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term);
@@ -1124,7 +1133,7 @@ case 2:
     break;
 
   case 132:
-#line 893 "perly.y" /* yacc.c:1648  */
+#line 902 "perly.y" /* yacc.c:1648  */
     { (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)) );
                        }
@@ -1132,7 +1141,7 @@ case 2:
     break;
 
   case 133:
-#line 897 "perly.y" /* yacc.c:1648  */
+#line 906 "perly.y" /* yacc.c:1648  */
     { (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)) );
                        }
@@ -1140,7 +1149,7 @@ case 2:
     break;
 
   case 134:
-#line 901 "perly.y" /* yacc.c:1648  */
+#line 910 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                                    op_prepend_elem(OP_LIST, scalar((ps[-5].val.opval)), (ps[-1].val.opval)),
@@ -1150,7 +1159,7 @@ case 2:
     break;
 
   case 135:
-#line 907 "perly.y" /* yacc.c:1648  */
+#line 916 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST, scalar((ps[-2].val.opval)),
                                    newMETHOP(OP_METHOD, 0, (ps[0].val.opval))));
@@ -1159,7 +1168,7 @@ case 2:
     break;
 
   case 136:
-#line 912 "perly.y" /* yacc.c:1648  */
+#line 921 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                                    op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)),
@@ -1169,7 +1178,7 @@ case 2:
     break;
 
   case 137:
-#line 918 "perly.y" /* yacc.c:1648  */
+#line 927 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                                    op_prepend_elem(OP_LIST, (ps[-3].val.opval), (ps[-1].val.opval)),
@@ -1179,32 +1188,32 @@ case 2:
     break;
 
   case 138:
-#line 924 "perly.y" /* yacc.c:1648  */
+#line 933 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
   case 139:
-#line 926 "perly.y" /* yacc.c:1648  */
+#line 935 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
   case 140:
-#line 928 "perly.y" /* yacc.c:1648  */
+#line 937 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
   case 141:
-#line 930 "perly.y" /* yacc.c:1648  */
+#line 939 "perly.y" /* yacc.c:1648  */
     { SvREFCNT_inc_simple_void(PL_compcv);
                          (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval)); }
 
     break;
 
   case 142:
-#line 933 "perly.y" /* yacc.c:1648  */
+#line 942 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                 op_append_elem(OP_LIST,
                                   op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), (ps[-4].val.opval)));
@@ -1213,20 +1222,20 @@ case 2:
     break;
 
   case 145:
-#line 948 "perly.y" /* yacc.c:1648  */
+#line 957 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); }
 
     break;
 
   case 146:
-#line 950 "perly.y" /* yacc.c:1648  */
+#line 959 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval)));
                        }
 
     break;
 
   case 147:
-#line 953 "perly.y" /* yacc.c:1648  */
+#line 962 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
                                        ref(newAVREF((ps[-4].val.opval)),OP_RV2AV),
                                        scalar((ps[-1].val.opval)));
@@ -1235,7 +1244,7 @@ case 2:
     break;
 
   case 148:
-#line 958 "perly.y" /* yacc.c:1648  */
+#line 967 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
                                        ref(newAVREF((ps[-3].val.opval)),OP_RV2AV),
                                        scalar((ps[-1].val.opval)));
@@ -1244,14 +1253,14 @@ case 2:
     break;
 
   case 149:
-#line 963 "perly.y" /* yacc.c:1648  */
+#line 972 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval)));
                        }
 
     break;
 
   case 150:
-#line 966 "perly.y" /* yacc.c:1648  */
+#line 975 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF((ps[-5].val.opval)),OP_RV2HV),
                                        jmaybe((ps[-2].val.opval))); }
@@ -1259,7 +1268,7 @@ case 2:
     break;
 
   case 151:
-#line 970 "perly.y" /* yacc.c:1648  */
+#line 979 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF((ps[-4].val.opval)),OP_RV2HV),
                                        jmaybe((ps[-2].val.opval))); }
@@ -1267,7 +1276,7 @@ case 2:
     break;
 
   case 152:
-#line 974 "perly.y" /* yacc.c:1648  */
+#line 983 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   newCVREF(0, scalar((ps[-3].val.opval))));
                          if (parser->expect == XBLOCK)
@@ -1277,7 +1286,7 @@ case 2:
     break;
 
   case 153:
-#line 980 "perly.y" /* yacc.c:1648  */
+#line 989 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   op_append_elem(OP_LIST, (ps[-1].val.opval),
                                       newCVREF(0, scalar((ps[-4].val.opval)))));
@@ -1288,7 +1297,7 @@ case 2:
     break;
 
   case 154:
-#line 988 "perly.y" /* yacc.c:1648  */
+#line 997 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   op_append_elem(OP_LIST, (ps[-1].val.opval),
                                               newCVREF(0, scalar((ps[-3].val.opval)))));
@@ -1299,7 +1308,7 @@ case 2:
     break;
 
   case 155:
-#line 995 "perly.y" /* yacc.c:1648  */
+#line 1004 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   newCVREF(0, scalar((ps[-2].val.opval))));
                          if (parser->expect == XBLOCK)
@@ -1309,37 +1318,37 @@ case 2:
     break;
 
   case 156:
-#line 1001 "perly.y" /* yacc.c:1648  */
+#line 1010 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); }
 
     break;
 
   case 157:
-#line 1003 "perly.y" /* yacc.c:1648  */
+#line 1012 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); }
 
     break;
 
   case 158:
-#line 1005 "perly.y" /* yacc.c:1648  */
+#line 1014 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); }
 
     break;
 
   case 159:
-#line 1010 "perly.y" /* yacc.c:1648  */
+#line 1019 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); }
 
     break;
 
   case 160:
-#line 1012 "perly.y" /* yacc.c:1648  */
+#line 1021 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 161:
-#line 1014 "perly.y" /* yacc.c:1648  */
+#line 1023 "perly.y" /* yacc.c:1648  */
     {   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)));
@@ -1348,111 +1357,111 @@ case 2:
     break;
 
   case 162:
-#line 1019 "perly.y" /* yacc.c:1648  */
+#line 1028 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 163:
-#line 1021 "perly.y" /* yacc.c:1648  */
+#line 1030 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 164:
-#line 1023 "perly.y" /* yacc.c:1648  */
+#line 1032 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 165:
-#line 1025 "perly.y" /* yacc.c:1648  */
+#line 1034 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 166:
-#line 1027 "perly.y" /* yacc.c:1648  */
+#line 1036 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 167:
-#line 1029 "perly.y" /* yacc.c:1648  */
+#line 1038 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 168:
-#line 1031 "perly.y" /* yacc.c:1648  */
+#line 1040 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 169:
-#line 1033 "perly.y" /* yacc.c:1648  */
+#line 1042 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 170:
-#line 1035 "perly.y" /* yacc.c:1648  */
+#line 1044 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 171:
-#line 1037 "perly.y" /* yacc.c:1648  */
+#line 1046 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 172:
-#line 1039 "perly.y" /* yacc.c:1648  */
+#line 1048 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 173:
-#line 1044 "perly.y" /* yacc.c:1648  */
+#line 1053 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 174:
-#line 1046 "perly.y" /* yacc.c:1648  */
+#line 1055 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 175:
-#line 1049 "perly.y" /* yacc.c:1648  */
+#line 1058 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 176:
-#line 1051 "perly.y" /* yacc.c:1648  */
+#line 1060 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 177:
-#line 1053 "perly.y" /* yacc.c:1648  */
+#line 1062 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
                                        op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); }
 
     break;
 
   case 178:
-#line 1056 "perly.y" /* yacc.c:1648  */
+#line 1065 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
                                        op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));}
 
     break;
 
   case 179:
-#line 1059 "perly.y" /* yacc.c:1648  */
+#line 1068 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_JOIN, 0,
                                       op_append_elem(
                                        OP_LIST,
@@ -1467,155 +1476,155 @@ case 2:
     break;
 
   case 180:
-#line 1070 "perly.y" /* yacc.c:1648  */
+#line 1079 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
                                        op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); }
 
     break;
 
   case 181:
-#line 1073 "perly.y" /* yacc.c:1648  */
+#line 1082 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
                                        op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); }
 
     break;
 
   case 182:
-#line 1080 "perly.y" /* yacc.c:1648  */
+#line 1089 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
 
     break;
 
   case 183:
-#line 1082 "perly.y" /* yacc.c:1648  */
+#line 1091 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newANONLIST(NULL);}
 
     break;
 
   case 184:
-#line 1084 "perly.y" /* yacc.c:1648  */
+#line 1093 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
 
     break;
 
   case 185:
-#line 1086 "perly.y" /* yacc.c:1648  */
+#line 1095 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newANONHASH(NULL); }
 
     break;
 
   case 186:
-#line 1088 "perly.y" /* yacc.c:1648  */
+#line 1097 "perly.y" /* yacc.c:1648  */
     { SvREFCNT_inc_simple_void(PL_compcv);
                          (yyval.opval) = newANONATTRSUB((ps[-3].val.ival), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 187:
-#line 1091 "perly.y" /* yacc.c:1648  */
+#line 1100 "perly.y" /* yacc.c:1648  */
     { SvREFCNT_inc_simple_void(PL_compcv);
                          (yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 188:
-#line 1097 "perly.y" /* yacc.c:1648  */
+#line 1106 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
 
     break;
 
   case 189:
-#line 1099 "perly.y" /* yacc.c:1648  */
+#line 1108 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}
 
     break;
 
   case 194:
-#line 1107 "perly.y" /* yacc.c:1648  */
+#line 1116 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 195:
-#line 1109 "perly.y" /* yacc.c:1648  */
+#line 1118 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
 
     break;
 
   case 196:
-#line 1111 "perly.y" /* yacc.c:1648  */
+#line 1120 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
 
     break;
 
   case 197:
-#line 1113 "perly.y" /* yacc.c:1648  */
+#line 1122 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 198:
-#line 1115 "perly.y" /* yacc.c:1648  */
+#line 1124 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = localize((ps[0].val.opval),0); }
 
     break;
 
   case 199:
-#line 1117 "perly.y" /* yacc.c:1648  */
+#line 1126 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = sawparens((ps[-1].val.opval)); }
 
     break;
 
   case 200:
-#line 1119 "perly.y" /* yacc.c:1648  */
+#line 1128 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 201:
-#line 1121 "perly.y" /* yacc.c:1648  */
+#line 1130 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = sawparens(newNULLLIST()); }
 
     break;
 
   case 202:
-#line 1123 "perly.y" /* yacc.c:1648  */
+#line 1132 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 203:
-#line 1125 "perly.y" /* yacc.c:1648  */
+#line 1134 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 204:
-#line 1127 "perly.y" /* yacc.c:1648  */
+#line 1136 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 205:
-#line 1129 "perly.y" /* yacc.c:1648  */
+#line 1138 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 206:
-#line 1131 "perly.y" /* yacc.c:1648  */
+#line 1140 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}
 
     break;
 
   case 207:
-#line 1133 "perly.y" /* yacc.c:1648  */
+#line 1142 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 208:
-#line 1135 "perly.y" /* yacc.c:1648  */
+#line 1144 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_prepend_elem(OP_ASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,
@@ -1629,7 +1638,7 @@ case 2:
     break;
 
   case 209:
-#line 1145 "perly.y" /* yacc.c:1648  */
+#line 1154 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_prepend_elem(OP_KVASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVASLICE, 0,
@@ -1643,7 +1652,7 @@ case 2:
     break;
 
   case 210:
-#line 1155 "perly.y" /* yacc.c:1648  */
+#line 1164 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_prepend_elem(OP_HSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,
@@ -1657,7 +1666,7 @@ case 2:
     break;
 
   case 211:
-#line 1165 "perly.y" /* yacc.c:1648  */
+#line 1174 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVHSLICE, 0,
@@ -1671,26 +1680,26 @@ case 2:
     break;
 
   case 212:
-#line 1175 "perly.y" /* yacc.c:1648  */
+#line 1184 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 213:
-#line 1177 "perly.y" /* yacc.c:1648  */
+#line 1186 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 214:
-#line 1179 "perly.y" /* yacc.c:1648  */
+#line 1188 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));
                        }
 
     break;
 
   case 215:
-#line 1182 "perly.y" /* yacc.c:1648  */
+#line 1191 "perly.y" /* yacc.c:1648  */
     {
                          (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));
@@ -1699,7 +1708,7 @@ case 2:
     break;
 
   case 216:
-#line 1187 "perly.y" /* yacc.c:1648  */
+#line 1196 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                            op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval))));
                        }
@@ -1707,130 +1716,130 @@ case 2:
     break;
 
   case 217:
-#line 1191 "perly.y" /* yacc.c:1648  */
+#line 1200 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSVREF((ps[-3].val.opval)); }
 
     break;
 
   case 218:
-#line 1193 "perly.y" /* yacc.c:1648  */
+#line 1202 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
 
     break;
 
   case 219:
-#line 1195 "perly.y" /* yacc.c:1648  */
+#line 1204 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newHVREF((ps[-3].val.opval)); }
 
     break;
 
   case 220:
-#line 1197 "perly.y" /* yacc.c:1648  */
+#line 1206 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
                                       scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }
 
     break;
 
   case 221:
-#line 1200 "perly.y" /* yacc.c:1648  */
+#line 1209 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }
 
     break;
 
   case 222:
-#line 1202 "perly.y" /* yacc.c:1648  */
+#line 1211 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
                            PL_hints |= HINT_BLOCK_SCOPE; }
 
     break;
 
   case 223:
-#line 1205 "perly.y" /* yacc.c:1648  */
+#line 1214 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }
 
     break;
 
   case 224:
-#line 1207 "perly.y" /* yacc.c:1648  */
+#line 1216 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 225:
-#line 1209 "perly.y" /* yacc.c:1648  */
+#line 1218 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP((ps[0].val.ival), 0); }
 
     break;
 
   case 226:
-#line 1211 "perly.y" /* yacc.c:1648  */
+#line 1220 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
   case 227:
-#line 1213 "perly.y" /* yacc.c:1648  */
+#line 1222 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
   case 228:
-#line 1215 "perly.y" /* yacc.c:1648  */
+#line 1224 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }
 
     break;
 
   case 229:
-#line 1217 "perly.y" /* yacc.c:1648  */
+#line 1226 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }
 
     break;
 
   case 230:
-#line 1219 "perly.y" /* yacc.c:1648  */
+#line 1228 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
 
     break;
 
   case 231:
-#line 1221 "perly.y" /* yacc.c:1648  */
+#line 1230 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                            op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); }
 
     break;
 
   case 232:
-#line 1224 "perly.y" /* yacc.c:1648  */
+#line 1233 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP((ps[0].val.ival), 0); }
 
     break;
 
   case 233:
-#line 1226 "perly.y" /* yacc.c:1648  */
+#line 1235 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP((ps[-2].val.ival), 0);}
 
     break;
 
   case 234:
-#line 1228 "perly.y" /* yacc.c:1648  */
+#line 1237 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 235:
-#line 1230 "perly.y" /* yacc.c:1648  */
+#line 1239 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[-2].val.opval); }
 
     break;
 
   case 236:
-#line 1232 "perly.y" /* yacc.c:1648  */
+#line 1241 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
 
     break;
 
   case 237:
-#line 1234 "perly.y" /* yacc.c:1648  */
+#line 1243 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = ((ps[-2].val.ival) == OP_NOT)
                           ? newUNOP((ps[-2].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0)))
                           : newOP((ps[-2].val.ival), OPf_SPECIAL); }
@@ -1838,13 +1847,13 @@ case 2:
     break;
 
   case 238:
-#line 1238 "perly.y" /* yacc.c:1648  */
+#line 1247 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
   case 239:
-#line 1240 "perly.y" /* yacc.c:1648  */
+#line 1249 "perly.y" /* yacc.c:1648  */
     {
                            if (   (ps[0].val.opval)->op_type != OP_TRANS
                                && (ps[0].val.opval)->op_type != OP_TRANSR
@@ -1859,115 +1868,115 @@ case 2:
     break;
 
   case 240:
-#line 1251 "perly.y" /* yacc.c:1648  */
+#line 1260 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }
 
     break;
 
   case 244:
-#line 1259 "perly.y" /* yacc.c:1648  */
+#line 1268 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }
 
     break;
 
   case 245:
-#line 1261 "perly.y" /* yacc.c:1648  */
+#line 1270 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = localize((ps[0].val.opval),1); }
 
     break;
 
   case 246:
-#line 1263 "perly.y" /* yacc.c:1648  */
+#line 1272 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }
 
     break;
 
   case 247:
-#line 1268 "perly.y" /* yacc.c:1648  */
+#line 1277 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = sawparens((ps[-1].val.opval)); }
 
     break;
 
   case 248:
-#line 1270 "perly.y" /* yacc.c:1648  */
+#line 1279 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = sawparens(newNULLLIST()); }
 
     break;
 
   case 249:
-#line 1273 "perly.y" /* yacc.c:1648  */
+#line 1282 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 250:
-#line 1275 "perly.y" /* yacc.c:1648  */
+#line 1284 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 251:
-#line 1277 "perly.y" /* yacc.c:1648  */
+#line 1286 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 252:
-#line 1282 "perly.y" /* yacc.c:1648  */
+#line 1291 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = NULL; }
 
     break;
 
   case 253:
-#line 1284 "perly.y" /* yacc.c:1648  */
+#line 1293 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 254:
-#line 1288 "perly.y" /* yacc.c:1648  */
+#line 1297 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = NULL; }
 
     break;
 
   case 255:
-#line 1290 "perly.y" /* yacc.c:1648  */
+#line 1299 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 256:
-#line 1294 "perly.y" /* yacc.c:1648  */
+#line 1303 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = NULL; }
 
     break;
 
   case 257:
-#line 1296 "perly.y" /* yacc.c:1648  */
+#line 1305 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 258:
-#line 1302 "perly.y" /* yacc.c:1648  */
+#line 1311 "perly.y" /* yacc.c:1648  */
     { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
 
     break;
 
   case 266:
-#line 1319 "perly.y" /* yacc.c:1648  */
+#line 1328 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }
 
     break;
 
   case 267:
-#line 1323 "perly.y" /* yacc.c:1648  */
+#line 1332 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSVREF((ps[0].val.opval)); }
 
     break;
 
   case 268:
-#line 1327 "perly.y" /* yacc.c:1648  */
+#line 1336 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[0].val.opval));
                          if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
                        }
@@ -1975,7 +1984,7 @@ case 2:
     break;
 
   case 269:
-#line 1333 "perly.y" /* yacc.c:1648  */
+#line 1342 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newHVREF((ps[0].val.opval));
                          if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
                        }
@@ -1983,61 +1992,61 @@ case 2:
     break;
 
   case 270:
-#line 1339 "perly.y" /* yacc.c:1648  */
+#line 1348 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[0].val.opval)); }
 
     break;
 
   case 271:
-#line 1341 "perly.y" /* yacc.c:1648  */
+#line 1350 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
 
     break;
 
   case 272:
-#line 1345 "perly.y" /* yacc.c:1648  */
+#line 1354 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }
 
     break;
 
   case 274:
-#line 1350 "perly.y" /* yacc.c:1648  */
+#line 1359 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[-2].val.opval)); }
 
     break;
 
   case 276:
-#line 1355 "perly.y" /* yacc.c:1648  */
+#line 1364 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newHVREF((ps[-2].val.opval)); }
 
     break;
 
   case 278:
-#line 1360 "perly.y" /* yacc.c:1648  */
+#line 1369 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }
 
     break;
 
   case 279:
-#line 1365 "perly.y" /* yacc.c:1648  */
+#line 1374 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = scalar((ps[0].val.opval)); }
 
     break;
 
   case 280:
-#line 1367 "perly.y" /* yacc.c:1648  */
+#line 1376 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = scalar((ps[0].val.opval)); }
 
     break;
 
   case 281:
-#line 1369 "perly.y" /* yacc.c:1648  */
+#line 1378 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_scope((ps[0].val.opval)); }
 
     break;
 
   case 282:
-#line 1372 "perly.y" /* yacc.c:1648  */
+#line 1381 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
@@ -2048,6 +2057,6 @@ case 2:
     
 
 /* Generated from:
- * 2c3a1b30e52b1e872156c881cc6e702a9c0d1be569bfa579632b5eec73ffa9ef perly.y
+ * c522864236e07231c0a218cecf8cdcd82b74ce082b72f10199de4deeff580100 perly.y
  * 0947213b55d0ed11693554bea04987e886cf285f5c14cf9075fa1e7acc3f4061 regen_perly.pl
  * ex: set ro: */

diff --git a/perly.h b/perly.h
index f15762c..fd9a19b 100644 (file)
--- a/perly.h
+++ b/perly.h
@@ -189,6 +189,6 @@ int yyparse (void);
 
 
 /* Generated from:
- * 2c3a1b30e52b1e872156c881cc6e702a9c0d1be569bfa579632b5eec73ffa9ef perly.y
+ * c522864236e07231c0a218cecf8cdcd82b74ce082b72f10199de4deeff580100 perly.y
  * 0947213b55d0ed11693554bea04987e886cf285f5c14cf9075fa1e7acc3f4061 regen_perly.pl
  * ex: set ro: */

diff --git a/perly.tab b/perly.tab
index 9670911..0026ead 100644 (file)
--- a/perly.tab
+++ b/perly.tab
@@ -81,24 +81,24 @@ static const yytype_uint16 yyrline[] =
      567,   571,   576,   580,   584,   585,   589,   595,   600,   605,
      606,   611,   612,   617,   618,   620,   625,   627,   639,   640,
      645,   647,   651,   671,   672,   674,   680,   745,   747,   753,
-     755,   759,   765,   766,   771,   772,   776,   780,   780,   839,
-     840,   845,   856,   857,   860,   871,   873,   875,   877,   881,
-     883,   888,   892,   896,   900,   906,   911,   917,   923,   925,
-     927,   930,   929,   940,   941,   945,   949,   952,   957,   962,
-     965,   969,   973,   979,   987,   994,  1000,  1002,  1004,  1009,
-    1011,  1013,  1018,  1020,  1022,  1024,  1026,  1028,  1030,  1032,
-    1034,  1036,  1038,  1043,  1045,  1048,  1050,  1052,  1055,  1058,
-    1069,  1072,  1079,  1081,  1083,  1085,  1087,  1090,  1096,  1098,
-    1102,  1103,  1104,  1105,  1106,  1108,  1110,  1112,  1114,  1116,
-    1118,  1120,  1122,  1124,  1126,  1128,  1130,  1132,  1134,  1144,
-    1154,  1164,  1174,  1176,  1178,  1181,  1186,  1190,  1192,  1194,
-    1196,  1199,  1201,  1204,  1206,  1208,  1210,  1212,  1214,  1216,
-    1218,  1220,  1223,  1225,  1227,  1229,  1231,  1233,  1237,  1240,
-    1239,  1252,  1253,  1254,  1258,  1260,  1262,  1267,  1269,  1272,
-    1274,  1276,  1281,  1283,  1288,  1289,  1294,  1295,  1301,  1305,
-    1306,  1307,  1310,  1311,  1314,  1315,  1318,  1322,  1326,  1332,
-    1338,  1340,  1344,  1348,  1349,  1353,  1354,  1358,  1359,  1364,
-    1366,  1368,  1371
+     755,   759,   765,   766,   771,   772,   776,   780,   780,   848,
+     849,   854,   865,   866,   869,   880,   882,   884,   886,   890,
+     892,   897,   901,   905,   909,   915,   920,   926,   932,   934,
+     936,   939,   938,   949,   950,   954,   958,   961,   966,   971,
+     974,   978,   982,   988,   996,  1003,  1009,  1011,  1013,  1018,
+    1020,  1022,  1027,  1029,  1031,  1033,  1035,  1037,  1039,  1041,
+    1043,  1045,  1047,  1052,  1054,  1057,  1059,  1061,  1064,  1067,
+    1078,  1081,  1088,  1090,  1092,  1094,  1096,  1099,  1105,  1107,
+    1111,  1112,  1113,  1114,  1115,  1117,  1119,  1121,  1123,  1125,
+    1127,  1129,  1131,  1133,  1135,  1137,  1139,  1141,  1143,  1153,
+    1163,  1173,  1183,  1185,  1187,  1190,  1195,  1199,  1201,  1203,
+    1205,  1208,  1210,  1213,  1215,  1217,  1219,  1221,  1223,  1225,
+    1227,  1229,  1232,  1234,  1236,  1238,  1240,  1242,  1246,  1249,
+    1248,  1261,  1262,  1263,  1267,  1269,  1271,  1276,  1278,  1281,
+    1283,  1285,  1290,  1292,  1297,  1298,  1303,  1304,  1310,  1314,
+    1315,  1316,  1319,  1320,  1323,  1324,  1327,  1331,  1335,  1341,
+    1347,  1349,  1353,  1357,  1358,  1362,  1363,  1367,  1368,  1373,
+    1375,  1377,  1380
 };
 #endif
 
@@ -1137,6 +1137,6 @@ static const toketypes yy_type_tab[] =
 };
 
 /* Generated from:
- * 2c3a1b30e52b1e872156c881cc6e702a9c0d1be569bfa579632b5eec73ffa9ef perly.y
+ * c522864236e07231c0a218cecf8cdcd82b74ce082b72f10199de4deeff580100 perly.y
  * 0947213b55d0ed11693554bea04987e886cf285f5c14cf9075fa1e7acc3f4061 regen_perly.pl
  * ex: set ro: */

diff --git a/perly.y b/perly.y
index b49b7c6..0325d66 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -816,9 +816,18 @@ subsigguts:
                                                 sigops);
                             /* a nextstate at the end handles context
                              * correctly for an empty sub body */
-                            $$ = op_append_elem(OP_LINESEQ,
+                            sigops = op_append_elem(OP_LINESEQ,
                                                 sigops,
                                                 newSTATEOP(0, NULL, NULL));
+                            /* wrap the list of arg ops in a NULL aux op.
+                              This serves two purposes. First, it makes
+                              the arg list a separate subtree from the
+                              body of the sub, and secondly the null op
+                              may in future be upgraded to an OP_SIGNATURE
+                              when implemented. For now leave it as
+                              ex-argcheck */
+                            $$ = newUNOP_AUX(OP_ARGCHECK, 0, sigops, NULL);
+                            op_null($$);
 
                             parser->in_my = 0;
                             /* tell the toker that attrributes can follow