Merge branch 'leonerd/feature-try-2' into blead

20 files changed, 549 insertions, 323 deletions

diff --git a/embed.fnc b/embed.fnc
index 5d71824fe0..eb7b47601a 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1443,6 +1443,7 @@ ApdR	|OP*	|newSLICEOP	|I32 flags|NULLOK OP* subscript|NULLOK OP* listop
 ApdR	|OP*	|newSTATEOP	|I32 flags|NULLOK char* label|NULLOK OP* o
 AdpbM	|CV*	|newSUB		|I32 floor|NULLOK OP* o|NULLOK OP* proto \
 				|NULLOK OP* block
+ApdRx	|OP*	|newTRYCATCHOP	|I32 flags|NN OP* tryblock|NN OP *catchvar|NN OP* catchblock
 pd	|CV *	|newXS_len_flags|NULLOK const char *name|STRLEN len \
 				|NN XSUBADDR_t subaddr\
 				|NULLOK const char *const filename \
@@ -3646,6 +3647,7 @@ Cixp	|void	|cx_pushformat   |NN PERL_CONTEXT *cx|NN CV *cv \
 Cixp	|void	|cx_popformat    |NN PERL_CONTEXT *cx
 Cixp	|void	|cx_pusheval     |NN PERL_CONTEXT *cx \
 				 |NULLOK OP *retop|NULLOK SV *namesv
+Cixp	|void	|cx_pushtry      |NN PERL_CONTEXT *cx|NULLOK OP *retop
 Cixp	|void	|cx_popeval      |NN PERL_CONTEXT *cx
 Cixp	|void	|cx_pushloop_plain|NN PERL_CONTEXT *cx
 Cixp	|void	|cx_pushloop_for |NN PERL_CONTEXT *cx \
diff --git a/embed.h b/embed.h
index e7cd57377f..10214db1fb 100644
--- a/embed.h
+++ b/embed.h
@@ -392,6 +392,7 @@
 #define newSVrv(a,b)		Perl_newSVrv(aTHX_ a,b)
 #define newSVsv_flags(a,b)	Perl_newSVsv_flags(aTHX_ a,b)
 #define newSVuv(a)		Perl_newSVuv(aTHX_ a)
+#define newTRYCATCHOP(a,b,c,d)	Perl_newTRYCATCHOP(aTHX_ a,b,c,d)
 #define newUNOP(a,b,c)		Perl_newUNOP(aTHX_ a,b,c)
 #define newUNOP_AUX(a,b,c,d)	Perl_newUNOP_AUX(aTHX_ a,b,c,d)
 #define newWHENOP(a,b)		Perl_newWHENOP(aTHX_ a,b)
@@ -821,6 +822,7 @@
 #define cx_pushloop_for(a,b,c)	Perl_cx_pushloop_for(aTHX_ a,b,c)
 #define cx_pushloop_plain(a)	Perl_cx_pushloop_plain(aTHX_ a)
 #define cx_pushsub(a,b,c,d)	Perl_cx_pushsub(aTHX_ a,b,c,d)
+#define cx_pushtry(a,b)		Perl_cx_pushtry(aTHX_ a,b)
 #define cx_pushwhen(a)		Perl_cx_pushwhen(aTHX_ a)
 #define cx_topblock(a)		Perl_cx_topblock(aTHX_ a)
 #define gimme_V()		Perl_gimme_V(aTHX)
@@ -1268,6 +1270,7 @@
 #define ck_svconst(a)		Perl_ck_svconst(aTHX_ a)
 #define ck_tell(a)		Perl_ck_tell(aTHX_ a)
 #define ck_trunc(a)		Perl_ck_trunc(aTHX_ a)
+#define ck_trycatch(a)		Perl_ck_trycatch(aTHX_ a)
 #define closest_cop(a,b,c,d)	Perl_closest_cop(aTHX_ a,b,c,d)
 #define cmpchain_extend(a,b,c)	Perl_cmpchain_extend(aTHX_ a,b,c)
 #define cmpchain_finish(a)	Perl_cmpchain_finish(aTHX_ a)
diff --git a/ext/Opcode/Opcode.pm b/ext/Opcode/Opcode.pm
index f1b2247b07..0501fb8f39 100644
--- a/ext/Opcode/Opcode.pm
+++ b/ext/Opcode/Opcode.pm
@@ -344,7 +344,7 @@ invert_opset function.
 
     cond_expr flip flop andassign orassign dorassign and or dor xor
 
-    warn die lineseq nextstate scope enter leave catch
+    warn die lineseq nextstate scope enter leave
 
     rv2cv anoncode prototype coreargs avhvswitch anonconst
 
@@ -435,6 +435,7 @@ These are a hotchpotch of opcodes still waiting to be considered
     localtime gmtime
 
     entertry leavetry -- can be used to 'hide' fatal errors
+    entertrycatch poptry catch leavetrycatch -- similar
 
     entergiven leavegiven
     enterwhen leavewhen
diff --git a/inline.h b/inline.h
index 777f9f6743..bbf27da6f5 100644
--- a/inline.h
+++ b/inline.h
@@ -2313,12 +2313,8 @@ Perl_cx_popformat(pTHX_ PERL_CONTEXT *cx)
 
 
 PERL_STATIC_INLINE void
-Perl_cx_pusheval(pTHX_ PERL_CONTEXT *cx, OP *retop, SV *namesv)
+Perl_push_evalortry_common(pTHX_ PERL_CONTEXT *cx, OP *retop, SV *namesv)
 {
-    PERL_ARGS_ASSERT_CX_PUSHEVAL;
-
-    cx->blk_eval.old_cxsubix   = PL_curstackinfo->si_cxsubix;
-    PL_curstackinfo->si_cxsubix= cx - PL_curstackinfo->si_cxstack;
     cx->blk_eval.retop         = retop;
     cx->blk_eval.old_namesv    = namesv;
     cx->blk_eval.old_eval_root = PL_eval_root;
@@ -2331,6 +2327,29 @@ Perl_cx_pusheval(pTHX_ PERL_CONTEXT *cx, OP *retop, SV *namesv)
     cx->blk_u16 = (PL_in_eval & 0x3F) | ((U16)PL_op->op_type << 7);
 }
 
+PERL_STATIC_INLINE void
+Perl_cx_pusheval(pTHX_ PERL_CONTEXT *cx, OP *retop, SV *namesv)
+{
+    PERL_ARGS_ASSERT_CX_PUSHEVAL;
+
+    Perl_push_evalortry_common(aTHX_ cx, retop, namesv);
+
+    cx->blk_eval.old_cxsubix    = PL_curstackinfo->si_cxsubix;
+    PL_curstackinfo->si_cxsubix = cx - PL_curstackinfo->si_cxstack;
+}
+
+PERL_STATIC_INLINE void
+Perl_cx_pushtry(pTHX_ PERL_CONTEXT *cx, OP *retop)
+{
+    PERL_ARGS_ASSERT_CX_PUSHTRY;
+
+    Perl_push_evalortry_common(aTHX_ cx, retop, NULL);
+
+    /* Don't actually change it, just store the current value so it's restored
+     * by the common popeval */
+    cx->blk_eval.old_cxsubix = PL_curstackinfo->si_cxsubix;
+}
+
 
 PERL_STATIC_INLINE void
 Perl_cx_popeval(pTHX_ PERL_CONTEXT *cx)
diff --git a/lib/B/Deparse.pm b/lib/B/Deparse.pm
index 96d569acb9..67147f12dd 100644
--- a/lib/B/Deparse.pm
+++ b/lib/B/Deparse.pm
@@ -4057,6 +4057,31 @@ sub pp_leavetry {
     return "eval {\n\t" . $self->pp_leave(@_) . "\n\b}";
 }
 
+sub pp_leavetrycatch {
+    my $self = shift;
+    my ($op) = @_;
+
+    # Expect that the first three kids should be (entertrycatch, poptry, catch)
+    my $entertrycatch = $op->first;
+    $entertrycatch->name eq "entertrycatch" or die "Expected entertrycatch as first child of leavetrycatch";
+
+    my $tryblock = $entertrycatch->sibling;
+    $tryblock->name eq "poptry" or die "Expected poptry as second child of leavetrycatch";
+
+    my $catch = $tryblock->sibling;
+    $catch->name eq "catch" or die "Expected catch as third child of leavetrycatch";
+
+    my $catchblock = $catch->first->sibling;
+    $catchblock->name eq "scope" or die "Expected scope as second child of catch";
+
+    my $trycode = scopeop(0, $self, $tryblock);
+    my $catchvar = $self->padname($catch->targ);
+    my $catchcode = scopeop(0, $self, $catchblock);
+
+    return "try {\n\t$trycode\n\b}\n" .
+           "catch($catchvar) {\n\t$catchcode\n\b}\cK";
+}
+
 sub _op_is_or_was {
   my ($op, $expect_type) = @_;
   my $type = $op->type;
diff --git a/lib/B/Deparse.t b/lib/B/Deparse.t
index fb3a7fc912..24eb445041 100644
--- a/lib/B/Deparse.t
+++ b/lib/B/Deparse.t
@@ -3162,3 +3162,12 @@ $a = int($c == $d != $e);
 $a = $b < ($c == $d != $e);
 $a = $b == ($c == $d != $e);
 $a = $b & $c == $d != $e;
+####
+# try/catch
+# CONTEXT use feature 'try'; no warnings 'experimental::try';
+try {
+    FIRST();
+}
+catch($var) {
+    SECOND();
+}
diff --git a/lib/B/Op_private.pm b/lib/B/Op_private.pm
index 480dac69a0..a5917dc300 100644
--- a/lib/B/Op_private.pm
+++ b/lib/B/Op_private.pm
@@ -311,6 +311,7 @@ $bits{entergiven}{0} = $bf[0];
 $bits{enteriter}{3} = 'OPpITER_DEF';
 @{$bits{entersub}}{5,4,0} = ($bf[8], $bf[8], 'OPpENTERSUB_INARGS');
 $bits{entertry}{0} = $bf[0];
+$bits{entertrycatch}{0} = $bf[0];
 $bits{enterwhen}{0} = $bf[0];
 @{$bits{enterwrite}}{3,2,1,0} = ($bf[4], $bf[4], $bf[4], $bf[4]);
 @{$bits{eof}}{3,2,1,0} = ($bf[4], $bf[4], $bf[4], $bf[4]);
diff --git a/op.c b/op.c
index cff984d093..594d4ee9c3 100644
--- a/op.c
+++ b/op.c
@@ -6699,6 +6699,7 @@ Perl_newUNOP(pTHX_ I32 type, I32 flags, OP *first)
 	|| (PL_opargs[type] & OA_CLASS_MASK) == OA_LOOPEXOP
 	|| type == OP_SASSIGN
 	|| type == OP_ENTERTRY
+        || type == OP_ENTERTRYCATCH
 	|| type == OP_CUSTOM
 	|| type == OP_NULL );
 
@@ -9816,6 +9817,63 @@ Perl_newCONDOP(pTHX_ I32 flags, OP *first, OP *trueop, OP *falseop)
 }
 
 /*
+=for apidoc newTRYCATCHOP
+
+Constructs and returns a conditional execution statement that implements
+the C<try>/C<catch> semantics.  First the op tree in C<tryblock> is executed,
+inside a context that traps exceptions.  If an exception occurs then the
+optree in C<catchblock> is executed, with the trapped exception set into the
+lexical variable given by C<catchvar> (which must be an op of type
+C<OP_PADSV>).  All the optrees are consumed by this function and become part
+of the returned op tree. 
+
+The C<flags> argument is currently ignored.
+
+=cut
+ */
+
+OP *
+Perl_newTRYCATCHOP(pTHX_ I32 flags, OP *tryblock, OP *catchvar, OP *catchblock)
+{
+    OP *o, *catchop;
+
+    PERL_ARGS_ASSERT_NEWTRYCATCHOP;
+    assert(catchvar->op_type == OP_PADSV);
+
+    PERL_UNUSED_ARG(flags);
+
+    /* The returned optree is shaped as:
+     *   LISTOP leavetrycatch
+     *       LOGOP entertrycatch
+     *       LISTOP poptry
+     *           $tryblock here
+     *       LOGOP catch
+     *           $catchblock here
+     */
+
+    if(tryblock->op_type != OP_LINESEQ)
+        tryblock = op_convert_list(OP_LINESEQ, 0, tryblock);
+    OpTYPE_set(tryblock, OP_POPTRY);
+
+    /* Manually construct a naked LOGOP.
+     * Normally if we call newLOGOP the returned value is a UNOP(OP_NULL)
+     * containing the LOGOP we wanted as its op_first */
+    catchop = (OP *)alloc_LOGOP(OP_CATCH, newOP(OP_NULL, 0), catchblock);
+    OpMORESIB_set(cUNOPx(catchop)->op_first, catchblock);
+    OpLASTSIB_set(catchblock, catchop);
+
+    /* Inject the catchvar's pad offset into the OP_CATCH targ */
+    cLOGOPx(catchop)->op_targ = catchvar->op_targ;
+    op_free(catchvar);
+
+    /* Build the optree structure */
+    o = newLISTOP(OP_LIST, 0, tryblock, catchop);
+    o = op_convert_list(OP_ENTERTRYCATCH, 0, o);
+
+    return o;
+}
+
+/*
 =for apidoc newRANGE
 
 Constructs and returns a C<range> op, with subordinate C<flip> and
@@ -12747,15 +12805,12 @@ Perl_ck_eval(pTHX_ OP *o)
 
 	if (o->op_type == OP_ENTERTRY) {
 	    LOGOP *enter;
-            U8 flags = o->op_flags;
 
             /* cut whole sibling chain free from o */
             op_sibling_splice(o, NULL, -1, NULL);
 	    op_free(o);
 
             enter = alloc_LOGOP(OP_ENTERTRY, NULL, NULL);
-            if(flags & OPf_SPECIAL)
-                enter->op_flags |= OPf_SPECIAL;
 
 	    /* establish postfix order */
 	    enter->op_next = (OP*)enter;
@@ -12800,6 +12855,69 @@ Perl_ck_eval(pTHX_ OP *o)
 }
 
 OP *
+Perl_ck_trycatch(pTHX_ OP *o)
+{
+    LOGOP *enter;
+    OP *to_free = NULL;
+    OP *trykid, *catchkid;
+    OP *catchroot, *catchstart;
+
+    PERL_ARGS_ASSERT_CK_TRYCATCH;
+
+    trykid = cUNOPo->op_first;
+    if(trykid->op_type == OP_NULL || trykid->op_type == OP_PUSHMARK) {
+        to_free = trykid;
+        trykid = OpSIBLING(trykid);
+    }
+    catchkid = OpSIBLING(trykid);
+
+    assert(trykid->op_type == OP_POPTRY);
+    assert(catchkid->op_type == OP_CATCH);
+
+    /* cut whole sibling chain free from o */
+    op_sibling_splice(o, NULL, -1, NULL);
+    if(to_free)
+        op_free(to_free);
+    op_free(o);
+
+    enter = alloc_LOGOP(OP_ENTERTRYCATCH, NULL, NULL);
+
+    /* establish postfix order */
+    enter->op_next = (OP*)enter;
+
+    o = op_prepend_elem(OP_LINESEQ, (OP*)enter, trykid);
+    op_append_elem(OP_LINESEQ, (OP*)o, catchkid);
+
+    OpTYPE_set(o, OP_LEAVETRYCATCH);
+
+    /* The returned optree is actually threaded up slightly nonobviously in
+     * terms of its ->op_next pointers.
+     *
+     * This way, if the tryblock dies, its retop points at the OP_CATCH, but
+     * if it does not then its leavetry skips over that and continues
+     * execution past it.
+     */
+
+    /* First, link up the actual body of the catch block */
+    catchroot = OpSIBLING(cUNOPx(catchkid)->op_first);
+    catchstart = LINKLIST(catchroot);
+    cLOGOPx(catchkid)->op_other = catchstart;
+
+    o->op_next = LINKLIST(o);
+
+    /* die within try block should jump to the catch */
+    enter->op_other = catchkid;
+
+    /* after try block that doesn't die, just skip straight to leavetrycatch */
+    trykid->op_next = o;
+
+    /* after catch block, skip back up to the leavetrycatch */
+    catchroot->op_next = o;
+
+    return o;
+}
+
+OP *
 Perl_ck_exec(pTHX_ OP *o)
 {
     PERL_ARGS_ASSERT_CK_EXEC;
diff --git a/op.h b/op.h
index c6de0d19fa..cd3926ddc5 100644
--- a/op.h
+++ b/op.h
@@ -147,7 +147,6 @@ Deprecated.  Use C<GIMME_V> instead.
                                 /*  On OP_DUMP, has no label */
                                 /*  On OP_UNSTACK, in a C-style for loop */
                                 /*  On OP_READLINE, it's for <<>>, not <> */
-                                /*  On OP_ENTERTRY, this is a real try {} block. */
 /* There is no room in op_flags for this one, so it has its own bit-
    field member (op_folded) instead.  The flag is only used to tell
    op_convert_list to set op_folded.  */
diff --git a/opcode.h b/opcode.h
index dc4254cb4e..c808bee65c 100644
--- a/opcode.h
+++ b/opcode.h
@@ -549,6 +549,9 @@ EXTCONST char* const PL_op_name[] = {
 	"isa",
 	"cmpchain_and",
 	"cmpchain_dup",
+	"entertrycatch",
+	"leavetrycatch",
+	"poptry",
 	"catch",
         "freed",
 };
@@ -958,6 +961,9 @@ EXTCONST char* const PL_op_desc[] = {
 	"derived class test",
 	"comparison chaining",
 	"comparand shuffling",
+	"try {block}",
+	"try {block} exit",
+	"pop try",
 	"catch {} block",
         "freed op",
 };
@@ -1370,6 +1376,9 @@ EXT Perl_ppaddr_t PL_ppaddr[] /* or perlvars.h */
 	Perl_pp_isa,
 	Perl_pp_cmpchain_and,
 	Perl_pp_cmpchain_dup,
+	Perl_pp_entertrycatch,
+	Perl_pp_leavetrycatch,
+	Perl_pp_poptry,
 	Perl_pp_catch,
 }
 #endif
@@ -1778,6 +1787,9 @@ EXT Perl_check_t PL_check[] /* or perlvars.h */
 	Perl_ck_isa,		/* isa */
 	Perl_ck_null,		/* cmpchain_and */
 	Perl_ck_null,		/* cmpchain_dup */
+	Perl_ck_trycatch,	/* entertrycatch */
+	Perl_ck_null,		/* leavetrycatch */
+	Perl_ck_null,		/* poptry */
 	Perl_ck_null,		/* catch */
 }
 #endif
@@ -2187,6 +2199,9 @@ EXTCONST U32 PL_opargs[] = {
 	0x00000204,	/* isa */
 	0x00000300,	/* cmpchain_and */
 	0x00000100,	/* cmpchain_dup */
+	0x00000300,	/* entertrycatch */
+	0x00000400,	/* leavetrycatch */
+	0x00000400,	/* poptry */
 	0x00000300,	/* catch */
 };
 #endif
@@ -2855,6 +2870,9 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
       12, /* isa */
        0, /* cmpchain_and */
        0, /* cmpchain_dup */
+       0, /* entertrycatch */
+      -1, /* leavetrycatch */
+      -1, /* poptry */
        0, /* catch */
 
 };
@@ -2874,7 +2892,7 @@ EXTCONST I16  PL_op_private_bitdef_ix[] = {
  */
 
 EXTCONST U16  PL_op_private_bitdefs[] = {
-    0x0003, /* scalar, prototype, refgen, srefgen, readline, regcmaybe, regcreset, regcomp, substcont, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, avalues, each, pop, shift, grepstart, mapstart, mapwhile, range, and, or, dor, andassign, orassign, dorassign, argcheck, argdefelem, method, method_named, method_super, method_redir, method_redir_super, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst, cmpchain_and, cmpchain_dup, catch */
+    0x0003, /* scalar, prototype, refgen, srefgen, readline, regcmaybe, regcreset, regcomp, substcont, chop, schop, defined, undef, study, preinc, i_preinc, predec, i_predec, postinc, i_postinc, postdec, i_postdec, negate, i_negate, not, complement, ucfirst, lcfirst, uc, lc, quotemeta, aeach, avalues, each, pop, shift, grepstart, mapstart, mapwhile, range, and, or, dor, andassign, orassign, dorassign, argcheck, argdefelem, method, method_named, method_super, method_redir, method_redir_super, entergiven, leavegiven, enterwhen, leavewhen, untie, tied, dbmclose, getsockname, getpeername, lstat, stat, readlink, readdir, telldir, rewinddir, closedir, localtime, alarm, require, dofile, entertry, ghbyname, gnbyname, gpbyname, shostent, snetent, sprotoent, sservent, gpwnam, gpwuid, ggrnam, ggrgid, lock, once, fc, anonconst, cmpchain_and, cmpchain_dup, entertrycatch, catch */
     0x2fdc, 0x41b9, /* pushmark */
     0x00bd, /* wantarray, runcv */
     0x0438, 0x1a50, 0x426c, 0x3d28, 0x3505, /* const */
@@ -3352,6 +3370,9 @@ EXTCONST U8 PL_op_private_valid[] = {
     /* ISA        */ (OPpARG2_MASK),
     /* CMPCHAIN_AND */ (OPpARG1_MASK),
     /* CMPCHAIN_DUP */ (OPpARG1_MASK),
+    /* ENTERTRYCATCH */ (OPpARG1_MASK),
+    /* LEAVETRYCATCH */ (0),
+    /* POPTRY     */ (0),
     /* CATCH      */ (OPpARG1_MASK),
 
 };
diff --git a/opnames.h b/opnames.h
index 57d29583af..f6c1552a52 100644
--- a/opnames.h
+++ b/opnames.h
@@ -414,11 +414,14 @@ typedef enum opcode {
 	OP_ISA		 = 397,
 	OP_CMPCHAIN_AND	 = 398,
 	OP_CMPCHAIN_DUP	 = 399,
-	OP_CATCH	 = 400,
+	OP_ENTERTRYCATCH = 400,
+	OP_LEAVETRYCATCH = 401,
+	OP_POPTRY	 = 402,
+	OP_CATCH	 = 403,
 	OP_max		
 } opcode;
 
-#define MAXO 401
+#define MAXO 404
 #define OP_FREED MAXO
 
 /* the OP_IS_* macros are optimized to a simple range check because
diff --git a/perly.act b/perly.act
index d623d04895..00192e61d7 100644
--- a/perly.act
+++ b/perly.act
@@ -520,30 +520,14 @@ case 2:
   case 56:
 #line 468 "perly.y"
     {
-			  OP *tryblock, *catchblock;
-			  
-			  tryblock = newUNOP(OP_ENTERTRY, OPf_SPECIAL, (ps[-8].val.opval));
-
-			  catchblock = newLOGOP(OP_CATCH, 0,
-			    newOP(OP_NULL, 0), /* LOGOP always needs an op_first */
-			    block_end((ps[-4].val.ival), op_scope((ps[0].val.opval))));
-
-			  /* catchblock itself is an OP_NULL; the real OP_CATCH is
-			   * its op_first */
-			  assert(cUNOPx(catchblock)->op_first->op_type == OP_CATCH);
-			  cUNOPx(catchblock)->op_first->op_targ = (ps[-3].val.opval)->op_targ;
-			  op_free((ps[-3].val.opval));
-
-			  (yyval.opval) = op_append_list(OP_LEAVE,
-			    newOP(OP_ENTER, 0),
-			    op_append_list(OP_LINESEQ,
-			      tryblock, catchblock));
+			  (yyval.opval) = newTRYCATCHOP(0,
+				  (ps[-8].val.opval), (ps[-3].val.opval), block_end((ps[-4].val.ival), op_scope((ps[0].val.opval))));
 			}
 
     break;
 
   case 57:
-#line 489 "perly.y"
+#line 473 "perly.y"
     {
 			  /* a block is a loop that happens once */
 			  (yyval.opval) = newWHILEOP(0, 1, NULL,
@@ -553,7 +537,7 @@ case 2:
     break;
 
   case 58:
-#line 495 "perly.y"
+#line 479 "perly.y"
     {
 			  package((ps[-2].val.opval));
 			  if ((ps[-3].val.opval)) {
@@ -564,7 +548,7 @@ case 2:
     break;
 
   case 59:
-#line 502 "perly.y"
+#line 486 "perly.y"
     {
 			  /* a block is a loop that happens once */
 			  (yyval.opval) = newWHILEOP(0, 1, NULL,
@@ -576,7 +560,7 @@ case 2:
     break;
 
   case 60:
-#line 510 "perly.y"
+#line 494 "perly.y"
     {
 			  (yyval.opval) = (ps[-1].val.opval);
 			}
@@ -584,7 +568,7 @@ case 2:
     break;
 
   case 61:
-#line 514 "perly.y"
+#line 498 "perly.y"
     {
 			  (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
 				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
@@ -593,7 +577,7 @@ case 2:
     break;
 
   case 62:
-#line 519 "perly.y"
+#line 503 "perly.y"
     {
 			  (yyval.opval) = NULL;
 			  parser->copline = NOLINE;
@@ -602,7 +586,7 @@ case 2:
     break;
 
   case 63:
-#line 527 "perly.y"
+#line 511 "perly.y"
     { OP *list;
 			  if ((ps[0].val.opval)) {
 			      OP *term = (ps[0].val.opval);
@@ -621,74 +605,74 @@ case 2:
     break;
 
   case 64:
-#line 544 "perly.y"
+#line 528 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 65:
-#line 546 "perly.y"
+#line 530 "perly.y"
     { (yyval.opval) = op_unscope((ps[-1].val.opval)); }
 
     break;
 
   case 67:
-#line 554 "perly.y"
+#line 538 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 68:
-#line 556 "perly.y"
+#line 540 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 69:
-#line 558 "perly.y"
+#line 542 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
 
     break;
 
   case 70:
-#line 560 "perly.y"
+#line 544 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
 
     break;
 
   case 71:
-#line 562 "perly.y"
+#line 546 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), (ps[-2].val.opval)); }
 
     break;
 
   case 72:
-#line 564 "perly.y"
+#line 548 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), (ps[-2].val.opval)); }
 
     break;
 
   case 73:
-#line 566 "perly.y"
+#line 550 "perly.y"
     { (yyval.opval) = newFOROP(0, NULL, (ps[0].val.opval), (ps[-2].val.opval), NULL);
 			  parser->copline = (line_t)(ps[-1].val.ival); }
 
     break;
 
   case 74:
-#line 569 "perly.y"
+#line 553 "perly.y"
     { (yyval.opval) = newWHENOP((ps[0].val.opval), op_scope((ps[-2].val.opval))); }
 
     break;
 
   case 75:
-#line 574 "perly.y"
+#line 558 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 76:
-#line 576 "perly.y"
+#line 560 "perly.y"
     {
 			  ((ps[0].val.opval))->op_flags |= OPf_PARENS;
 			  (yyval.opval) = op_scope((ps[0].val.opval));
@@ -697,7 +681,7 @@ case 2:
     break;
 
   case 77:
-#line 581 "perly.y"
+#line 565 "perly.y"
     { parser->copline = (line_t)(ps[-5].val.ival);
 			    (yyval.opval) = newCONDOP(0,
 				newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)),
@@ -708,19 +692,19 @@ case 2:
     break;
 
   case 78:
-#line 591 "perly.y"
+#line 575 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 79:
-#line 593 "perly.y"
+#line 577 "perly.y"
     { (yyval.opval) = op_scope((ps[0].val.opval)); }
 
     break;
 
   case 80:
-#line 598 "perly.y"
+#line 582 "perly.y"
     { (yyval.ival) = (PL_min_intro_pending &&
 			    PL_max_intro_pending >=  PL_min_intro_pending);
 			  intro_my(); }
@@ -728,13 +712,13 @@ case 2:
     break;
 
   case 81:
-#line 604 "perly.y"
+#line 588 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 83:
-#line 610 "perly.y"
+#line 594 "perly.y"
     { YYSTYPE tmplval;
 			  (void)scan_num("1", &tmplval);
 			  (yyval.opval) = tmplval.opval; }
@@ -742,118 +726,118 @@ case 2:
     break;
 
   case 85:
-#line 618 "perly.y"
+#line 602 "perly.y"
     { (yyval.opval) = invert(scalar((ps[0].val.opval))); }
 
     break;
 
   case 86:
-#line 623 "perly.y"
+#line 607 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); intro_my(); }
 
     break;
 
   case 87:
-#line 627 "perly.y"
+#line 611 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); intro_my(); }
 
     break;
 
   case 88:
-#line 630 "perly.y"
+#line 614 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 89:
-#line 631 "perly.y"
+#line 615 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 90:
-#line 635 "perly.y"
+#line 619 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, 0);
 			    SAVEFREESV(PL_compcv); }
 
     break;
 
   case 91:
-#line 641 "perly.y"
+#line 625 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
 			    SAVEFREESV(PL_compcv); }
 
     break;
 
   case 92:
-#line 646 "perly.y"
+#line 630 "perly.y"
     { (yyval.ival) = start_subparse(TRUE, 0);
 			    SAVEFREESV(PL_compcv); }
 
     break;
 
   case 95:
-#line 657 "perly.y"
+#line 641 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 97:
-#line 663 "perly.y"
+#line 647 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 98:
-#line 665 "perly.y"
+#line 649 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 99:
-#line 667 "perly.y"
+#line 651 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 100:
-#line 672 "perly.y"
+#line 656 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 101:
-#line 674 "perly.y"
+#line 658 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 102:
-#line 685 "perly.y"
+#line 669 "perly.y"
     { parser->in_my = 0; (yyval.opval) = NULL; }
 
     break;
 
   case 103:
-#line 687 "perly.y"
+#line 671 "perly.y"
     { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 104:
-#line 692 "perly.y"
+#line 676 "perly.y"
     { (yyval.ival) = '@'; }
 
     break;
 
   case 105:
-#line 694 "perly.y"
+#line 678 "perly.y"
     { (yyval.ival) = '%'; }
 
     break;
 
   case 106:
-#line 698 "perly.y"
+#line 682 "perly.y"
     {
                             I32 sigil   = (ps[-2].val.ival);
                             OP *var     = (ps[-1].val.opval);
@@ -873,25 +857,25 @@ case 2:
     break;
 
   case 107:
-#line 717 "perly.y"
+#line 701 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 108:
-#line 719 "perly.y"
+#line 703 "perly.y"
     { (yyval.opval) = newOP(OP_NULL, 0); }
 
     break;
 
   case 109:
-#line 721 "perly.y"
+#line 705 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 110:
-#line 727 "perly.y"
+#line 711 "perly.y"
     {
                             OP *var     = (ps[-1].val.opval);
                             OP *defexpr = (ps[0].val.opval);
@@ -956,25 +940,25 @@ case 2:
     break;
 
   case 111:
-#line 792 "perly.y"
+#line 776 "perly.y"
     { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 112:
-#line 794 "perly.y"
+#line 778 "perly.y"
     { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 113:
-#line 800 "perly.y"
+#line 784 "perly.y"
     { (yyval.opval) = (ps[-1].val.opval); }
 
     break;
 
   case 114:
-#line 802 "perly.y"
+#line 786 "perly.y"
     {
 			  (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-2].val.opval), (ps[0].val.opval));
 			}
@@ -982,43 +966,43 @@ case 2:
     break;
 
   case 115:
-#line 806 "perly.y"
+#line 790 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 116:
-#line 811 "perly.y"
+#line 795 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 117:
-#line 813 "perly.y"
+#line 797 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 118:
-#line 817 "perly.y"
+#line 801 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 119:
-#line 819 "perly.y"
+#line 803 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 120:
-#line 823 "perly.y"
+#line 807 "perly.y"
     { (yyval.opval) = (ps[-1].val.opval); }
 
     break;
 
   case 121:
-#line 826 "perly.y"
+#line 810 "perly.y"
     {
                             ENTER;
                             SAVEIV(parser->sig_elems);
@@ -1033,7 +1017,7 @@ case 2:
     break;
 
   case 122:
-#line 837 "perly.y"
+#line 821 "perly.y"
     {
                             OP            *sigops = (ps[0].val.opval);
                             struct op_argcheck_aux *aux;
@@ -1092,19 +1076,19 @@ case 2:
     break;
 
   case 123:
-#line 894 "perly.y"
+#line 878 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 124:
-#line 895 "perly.y"
+#line 879 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 125:
-#line 901 "perly.y"
+#line 885 "perly.y"
     {
 			  if (parser->copline > (line_t)(ps[-2].val.ival))
 			      parser->copline = (line_t)(ps[-2].val.ival);
@@ -1114,19 +1098,19 @@ case 2:
     break;
 
   case 126:
-#line 911 "perly.y"
+#line 895 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 127:
-#line 912 "perly.y"
+#line 896 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 128:
-#line 916 "perly.y"
+#line 900 "perly.y"
     {
 			  if (parser->copline > (line_t)(ps[-2].val.ival))
 			      parser->copline = (line_t)(ps[-2].val.ival);
@@ -1137,25 +1121,25 @@ case 2:
     break;
 
   case 129:
-#line 927 "perly.y"
+#line 911 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 130:
-#line 929 "perly.y"
+#line 913 "perly.y"
     { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 132:
-#line 935 "perly.y"
+#line 919 "perly.y"
     { (yyval.opval) = (ps[-1].val.opval); }
 
     break;
 
   case 133:
-#line 937 "perly.y"
+#line 921 "perly.y"
     {
 			  OP* term = (ps[0].val.opval);
 			  (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term);
@@ -1164,7 +1148,7 @@ case 2:
     break;
 
   case 135:
-#line 946 "perly.y"
+#line 930 "perly.y"
     { (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)) );
 			}
@@ -1172,7 +1156,7 @@ case 2:
     break;
 
   case 136:
-#line 950 "perly.y"
+#line 934 "perly.y"
     { (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)) );
 			}
@@ -1180,7 +1164,7 @@ case 2:
     break;
 
   case 137:
-#line 954 "perly.y"
+#line 938 "perly.y"
     { (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)),
@@ -1190,7 +1174,7 @@ case 2:
     break;
 
   case 138:
-#line 960 "perly.y"
+#line 944 "perly.y"
     { (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))));
@@ -1199,7 +1183,7 @@ case 2:
     break;
 
   case 139:
-#line 965 "perly.y"
+#line 949 "perly.y"
     { (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)),
@@ -1209,7 +1193,7 @@ case 2:
     break;
 
   case 140:
-#line 971 "perly.y"
+#line 955 "perly.y"
     { (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)),
@@ -1219,32 +1203,32 @@ case 2:
     break;
 
   case 141:
-#line 977 "perly.y"
+#line 961 "perly.y"
     { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
   case 142:
-#line 979 "perly.y"
+#line 963 "perly.y"
     { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
   case 143:
-#line 981 "perly.y"
+#line 965 "perly.y"
     { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
   case 144:
-#line 983 "perly.y"
+#line 967 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 			  (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval)); }
 
     break;
 
   case 145:
-#line 986 "perly.y"
+#line 970 "perly.y"
     { (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)));
@@ -1253,20 +1237,20 @@ case 2:
     break;
 
   case 148:
-#line 1001 "perly.y"
+#line 985 "perly.y"
     { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); }
 
     break;
 
   case 149:
-#line 1003 "perly.y"
+#line 987 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval)));
 			}
 
     break;
 
   case 150:
-#line 1006 "perly.y"
+#line 990 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((ps[-4].val.opval)),OP_RV2AV),
 					scalar((ps[-1].val.opval)));
@@ -1275,7 +1259,7 @@ case 2:
     break;
 
   case 151:
-#line 1011 "perly.y"
+#line 995 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((ps[-3].val.opval)),OP_RV2AV),
 					scalar((ps[-1].val.opval)));
@@ -1284,14 +1268,14 @@ case 2:
     break;
 
   case 152:
-#line 1016 "perly.y"
+#line 1000 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval)));
 			}
 
     break;
 
   case 153:
-#line 1019 "perly.y"
+#line 1003 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((ps[-5].val.opval)),OP_RV2HV),
 					jmaybe((ps[-2].val.opval))); }
@@ -1299,7 +1283,7 @@ case 2:
     break;
 
   case 154:
-#line 1023 "perly.y"
+#line 1007 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((ps[-4].val.opval)),OP_RV2HV),
 					jmaybe((ps[-2].val.opval))); }
@@ -1307,7 +1291,7 @@ case 2:
     break;
 
   case 155:
-#line 1027 "perly.y"
+#line 1011 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar((ps[-3].val.opval))));
 			  if (parser->expect == XBLOCK)
@@ -1317,7 +1301,7 @@ case 2:
     break;
 
   case 156:
-#line 1033 "perly.y"
+#line 1017 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, (ps[-1].val.opval),
 				       newCVREF(0, scalar((ps[-4].val.opval)))));
@@ -1328,7 +1312,7 @@ case 2:
     break;
 
   case 157:
-#line 1041 "perly.y"
+#line 1025 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, (ps[-1].val.opval),
 					       newCVREF(0, scalar((ps[-3].val.opval)))));
@@ -1339,7 +1323,7 @@ case 2:
     break;
 
   case 158:
-#line 1048 "perly.y"
+#line 1032 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar((ps[-2].val.opval))));
 			  if (parser->expect == XBLOCK)
@@ -1349,37 +1333,37 @@ case 2:
     break;
 
   case 159:
-#line 1054 "perly.y"
+#line 1038 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); }
 
     break;
 
   case 160:
-#line 1056 "perly.y"
+#line 1040 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); }
 
     break;
 
   case 161:
-#line 1058 "perly.y"
+#line 1042 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); }
 
     break;
 
   case 162:
-#line 1063 "perly.y"
+#line 1047 "perly.y"
     { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); }
 
     break;
 
   case 163:
-#line 1065 "perly.y"
+#line 1049 "perly.y"
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 164:
-#line 1067 "perly.y"
+#line 1051 "perly.y"
     {   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)));
@@ -1388,183 +1372,183 @@ case 2:
     break;
 
   case 165:
-#line 1072 "perly.y"
+#line 1056 "perly.y"
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 166:
-#line 1074 "perly.y"
+#line 1058 "perly.y"
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 167:
-#line 1076 "perly.y"
+#line 1060 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 168:
-#line 1078 "perly.y"
+#line 1062 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 169:
-#line 1080 "perly.y"
+#line 1064 "perly.y"
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 170:
-#line 1082 "perly.y"
+#line 1066 "perly.y"
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 171:
-#line 1084 "perly.y"
+#line 1068 "perly.y"
     { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 172:
-#line 1086 "perly.y"
+#line 1070 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 173:
-#line 1088 "perly.y"
+#line 1072 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 174:
-#line 1090 "perly.y"
+#line 1074 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 175:
-#line 1092 "perly.y"
+#line 1076 "perly.y"
     { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 176:
-#line 1096 "perly.y"
+#line 1080 "perly.y"
     { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }
 
     break;
 
   case 177:
-#line 1098 "perly.y"
+#line 1082 "perly.y"
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 178:
-#line 1100 "perly.y"
+#line 1084 "perly.y"
     { yyerror("syntax error"); YYERROR; }
 
     break;
 
   case 179:
-#line 1102 "perly.y"
+#line 1086 "perly.y"
     { yyerror("syntax error"); YYERROR; }
 
     break;
 
   case 180:
-#line 1106 "perly.y"
+#line 1090 "perly.y"
     { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 181:
-#line 1108 "perly.y"
+#line 1092 "perly.y"
     { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 182:
-#line 1112 "perly.y"
+#line 1096 "perly.y"
     { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }
 
     break;
 
   case 183:
-#line 1114 "perly.y"
+#line 1098 "perly.y"
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
   case 184:
-#line 1116 "perly.y"
+#line 1100 "perly.y"
     { yyerror("syntax error"); YYERROR; }
 
     break;
 
   case 185:
-#line 1118 "perly.y"
+#line 1102 "perly.y"
     { yyerror("syntax error"); YYERROR; }
 
     break;
 
   case 186:
-#line 1122 "perly.y"
+#line 1106 "perly.y"
     { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 187:
-#line 1124 "perly.y"
+#line 1108 "perly.y"
     { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 188:
-#line 1129 "perly.y"
+#line 1113 "perly.y"
     { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 189:
-#line 1131 "perly.y"
+#line 1115 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 190:
-#line 1134 "perly.y"
+#line 1118 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 191:
-#line 1136 "perly.y"
+#line 1120 "perly.y"
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 192:
-#line 1138 "perly.y"
+#line 1122 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
 					op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); }
 
     break;
 
   case 193:
-#line 1141 "perly.y"
+#line 1125 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
 					op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));}
 
     break;
 
   case 194:
-#line 1144 "perly.y"
+#line 1128 "perly.y"
     { (yyval.opval) = op_convert_list(OP_JOIN, 0,
 				       op_append_elem(
 					OP_LIST,
@@ -1579,155 +1563,155 @@ case 2:
     break;
 
   case 195:
-#line 1155 "perly.y"
+#line 1139 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
 					op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); }
 
     break;
 
   case 196:
-#line 1158 "perly.y"
+#line 1142 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
 					op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); }
 
     break;
 
   case 197:
-#line 1165 "perly.y"
+#line 1149 "perly.y"
     { (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
 
     break;
 
   case 198:
-#line 1167 "perly.y"
+#line 1151 "perly.y"
     { (yyval.opval) = newANONLIST(NULL);}
 
     break;
 
   case 199:
-#line 1169 "perly.y"
+#line 1153 "perly.y"
     { (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
 
     break;
 
   case 200:
-#line 1171 "perly.y"
+#line 1155 "perly.y"
     { (yyval.opval) = newANONHASH(NULL); }
 
     break;
 
   case 201:
-#line 1173 "perly.y"
+#line 1157 "perly.y"
     { 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 202:
-#line 1176 "perly.y"
+#line 1160 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 			  (yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 203:
-#line 1182 "perly.y"
+#line 1166 "perly.y"
     { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
 
     break;
 
   case 204:
-#line 1184 "perly.y"
+#line 1168 "perly.y"
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}
 
     break;
 
   case 209:
-#line 1192 "perly.y"
+#line 1176 "perly.y"
     { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
   case 210:
-#line 1194 "perly.y"
+#line 1178 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
 
     break;
 
   case 211:
-#line 1196 "perly.y"
+#line 1180 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
 
     break;
 
   case 212:
-#line 1198 "perly.y"
+#line 1182 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 213:
-#line 1200 "perly.y"
+#line 1184 "perly.y"
     { (yyval.opval) = localize((ps[0].val.opval),0); }
 
     break;
 
   case 214:
-#line 1202 "perly.y"
+#line 1186 "perly.y"
     { (yyval.opval) = sawparens((ps[-1].val.opval)); }
 
     break;
 
   case 215:
-#line 1204 "perly.y"
+#line 1188 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 216:
-#line 1206 "perly.y"
+#line 1190 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST()); }
 
     break;
 
   case 217:
-#line 1208 "perly.y"
+#line 1192 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 218:
-#line 1210 "perly.y"
+#line 1194 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 219:
-#line 1212 "perly.y"
+#line 1196 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 220:
-#line 1214 "perly.y"
+#line 1198 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 221:
-#line 1216 "perly.y"
+#line 1200 "perly.y"
     { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}
 
     break;
 
   case 222:
-#line 1218 "perly.y"
+#line 1202 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 223:
-#line 1220 "perly.y"
+#line 1204 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
@@ -1741,7 +1725,7 @@ case 2:
     break;
 
   case 224:
-#line 1230 "perly.y"
+#line 1214 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_KVASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_KVASLICE, 0,
@@ -1755,7 +1739,7 @@ case 2:
     break;
 
   case 225:
-#line 1240 "perly.y"
+#line 1224 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
@@ -1769,7 +1753,7 @@ case 2:
     break;
 
   case 226:
-#line 1250 "perly.y"
+#line 1234 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_KVHSLICE, 0,
@@ -1783,26 +1767,26 @@ case 2:
     break;
 
   case 227:
-#line 1260 "perly.y"
+#line 1244 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 228:
-#line 1262 "perly.y"
+#line 1246 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 229:
-#line 1264 "perly.y"
+#line 1248 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));
 			}
 
     break;
 
   case 230:
-#line 1267 "perly.y"
+#line 1251 "perly.y"
     {
 			  (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));
@@ -1811,7 +1795,7 @@ case 2:
     break;
 
   case 231:
-#line 1272 "perly.y"
+#line 1256 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval))));
 			}
@@ -1819,130 +1803,130 @@ case 2:
     break;
 
   case 232:
-#line 1276 "perly.y"
+#line 1260 "perly.y"
     { (yyval.opval) = newSVREF((ps[-3].val.opval)); }
 
     break;
 
   case 233:
-#line 1278 "perly.y"
+#line 1262 "perly.y"
     { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
 
     break;
 
   case 234:
-#line 1280 "perly.y"
+#line 1264 "perly.y"
     { (yyval.opval) = newHVREF((ps[-3].val.opval)); }
 
     break;
 
   case 235:
-#line 1282 "perly.y"
+#line 1266 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
 				       scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }
 
     break;
 
   case 236:
-#line 1285 "perly.y"
+#line 1269 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }
 
     break;
 
   case 237:
-#line 1287 "perly.y"
+#line 1271 "perly.y"
     { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
 			    PL_hints |= HINT_BLOCK_SCOPE; }
 
     break;
 
   case 238:
-#line 1290 "perly.y"
+#line 1274 "perly.y"
     { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }
 
     break;
 
   case 239:
-#line 1292 "perly.y"
+#line 1276 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
 
     break;
 
   case 240:
-#line 1294 "perly.y"
+#line 1278 "perly.y"
     { (yyval.opval) = newOP((ps[0].val.ival), 0); }
 
     break;
 
   case 241:
-#line 1296 "perly.y"
+#line 1280 "perly.y"
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
   case 242:
-#line 1298 "perly.y"
+#line 1282 "perly.y"
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
   case 243:
-#line 1300 "perly.y"
+#line 1284 "perly.y"
     { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }
 
     break;
 
   case 244:
-#line 1302 "perly.y"
+#line 1286 "perly.y"
     { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }
 
     break;
 
   case 245:
-#line 1304 "perly.y"
+#line 1288 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
 
     break;
 
   case 246:
-#line 1306 "perly.y"
+#line 1290 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); }
 
     break;
 
   case 247:
-#line 1309 "perly.y"
+#line 1293 "perly.y"
     { (yyval.opval) = newOP((ps[0].val.ival), 0); }
 
     break;
 
   case 248:
-#line 1311 "perly.y"
+#line 1295 "perly.y"
     { (yyval.opval) = newOP((ps[-2].val.ival), 0);}
 
     break;
 
   case 249:
-#line 1313 "perly.y"
+#line 1297 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 250:
-#line 1315 "perly.y"
+#line 1299 "perly.y"
     { (yyval.opval) = (ps[-2].val.opval); }
 
     break;
 
   case 251:
-#line 1317 "perly.y"
+#line 1301 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
 
     break;
 
   case 252:
-#line 1319 "perly.y"
+#line 1303 "perly.y"
     { (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); }
@@ -1950,13 +1934,13 @@ case 2:
     break;
 
   case 253:
-#line 1323 "perly.y"
+#line 1307 "perly.y"
     { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
   case 254:
-#line 1325 "perly.y"
+#line 1309 "perly.y"
     {
 			    if (   (ps[0].val.opval)->op_type != OP_TRANS
 			        && (ps[0].val.opval)->op_type != OP_TRANSR
@@ -1971,115 +1955,115 @@ case 2:
     break;
 
   case 255:
-#line 1336 "perly.y"
+#line 1320 "perly.y"
     { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }
 
     break;
 
   case 259:
-#line 1344 "perly.y"
+#line 1328 "perly.y"
     { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }
 
     break;
 
   case 260:
-#line 1346 "perly.y"
+#line 1330 "perly.y"
     { (yyval.opval) = localize((ps[0].val.opval),1); }
 
     break;
 
   case 261:
-#line 1348 "perly.y"
+#line 1332 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }
 
     break;
 
   case 262:
-#line 1353 "perly.y"
+#line 1337 "perly.y"
     { (yyval.opval) = sawparens((ps[-1].val.opval)); }
 
     break;
 
   case 263:
-#line 1355 "perly.y"
+#line 1339 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST()); }
 
     break;
 
   case 264:
-#line 1358 "perly.y"
+#line 1342 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 265:
-#line 1360 "perly.y"
+#line 1344 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 266:
-#line 1362 "perly.y"
+#line 1346 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 267:
-#line 1367 "perly.y"
+#line 1351 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 268:
-#line 1369 "perly.y"
+#line 1353 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 269:
-#line 1373 "perly.y"
+#line 1357 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 270:
-#line 1375 "perly.y"
+#line 1359 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 271:
-#line 1379 "perly.y"
+#line 1363 "perly.y"
     { (yyval.opval) = NULL; }
 
     break;
 
   case 272:
-#line 1381 "perly.y"
+#line 1365 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
   case 273:
-#line 1387 "perly.y"
+#line 1371 "perly.y"
     { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
 
     break;
 
   case 281:
-#line 1404 "perly.y"
+#line 1388 "perly.y"
     { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }
 
     break;
 
   case 282:
-#line 1408 "perly.y"
+#line 1392 "perly.y"
     { (yyval.opval) = newSVREF((ps[0].val.opval)); }
 
     break;
 
   case 283:
-#line 1412 "perly.y"
+#line 1396 "perly.y"
     { (yyval.opval) = newAVREF((ps[0].val.opval));
 			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
 			}
@@ -2087,7 +2071,7 @@ case 2:
     break;
 
   case 284:
-#line 1418 "perly.y"
+#line 1402 "perly.y"
     { (yyval.opval) = newHVREF((ps[0].val.opval));
 			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
 			}
@@ -2095,61 +2079,61 @@ case 2:
     break;
 
   case 285:
-#line 1424 "perly.y"
+#line 1408 "perly.y"
     { (yyval.opval) = newAVREF((ps[0].val.opval)); }
 
     break;
 
   case 286:
-#line 1426 "perly.y"
+#line 1410 "perly.y"
     { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
 
     break;
 
   case 287:
-#line 1430 "perly.y"
+#line 1414 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }
 
     break;
 
   case 289:
-#line 1435 "perly.y"
+#line 1419 "perly.y"
     { (yyval.opval) = newAVREF((ps[-2].val.opval)); }
 
     break;
 
   case 291:
-#line 1440 "perly.y"
+#line 1424 "perly.y"
     { (yyval.opval) = newHVREF((ps[-2].val.opval)); }
 
     break;
 
   case 293:
-#line 1445 "perly.y"
+#line 1429 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }
 
     break;
 
   case 294:
-#line 1450 "perly.y"
+#line 1434 "perly.y"
     { (yyval.opval) = scalar((ps[0].val.opval)); }
 
     break;
 
   case 295:
-#line 1452 "perly.y"
+#line 1436 "perly.y"
     { (yyval.opval) = scalar((ps[0].val.opval)); }
 
     break;
 
   case 296:
-#line 1454 "perly.y"
+#line 1438 "perly.y"
     { (yyval.opval) = op_scope((ps[0].val.opval)); }
 
     break;
 
   case 297:
-#line 1457 "perly.y"
+#line 1441 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
@@ -2160,6 +2144,6 @@ case 2:
     
 
 /* Generated from:
- * 672539c523be1568df09c599b38a828c80473c60e1fddd63764d66f74e4e7b11 perly.y
+ * 427b422b0ce1154d834dc461973a3254729575694f98ab600032f67ccab7b9e5 perly.y
  * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.h b/perly.h
index 9b09e2c535..545cf3f6b0 100644
--- a/perly.h
+++ b/perly.h
@@ -218,6 +218,6 @@ int yyparse (void);
 
 
 /* Generated from:
- * 672539c523be1568df09c599b38a828c80473c60e1fddd63764d66f74e4e7b11 perly.y
+ * 427b422b0ce1154d834dc461973a3254729575694f98ab600032f67ccab7b9e5 perly.y
  * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.tab b/perly.tab
index b5674d0542..91a88c5c4b 100644
--- a/perly.tab
+++ b/perly.tab
@@ -77,31 +77,31 @@ static const yytype_uint16 yyrline[] =
      247,   253,   255,   264,   266,   275,   279,   283,   290,   300,
      302,   315,   312,   336,   331,   352,   360,   359,   368,   374,
      380,   385,   387,   389,   396,   404,   406,   403,   423,   428,
-     435,   434,   449,   457,   464,   466,   463,   488,   495,   494,
-     509,   513,   518,   526,   543,   545,   549,   553,   555,   557,
-     559,   561,   563,   565,   568,   573,   575,   580,   590,   592,
-     597,   603,   605,   609,   613,   617,   622,   626,   630,   631,
-     634,   640,   645,   651,   652,   656,   658,   662,   664,   666,
-     671,   673,   684,   686,   691,   693,   697,   716,   718,   720,
-     726,   791,   793,   799,   801,   805,   810,   812,   816,   818,
-     822,   826,   826,   894,   895,   900,   911,   912,   915,   926,
-     928,   930,   934,   936,   941,   945,   949,   953,   959,   964,
-     970,   976,   978,   980,   983,   982,   993,   994,   998,  1002,
-    1005,  1010,  1015,  1018,  1022,  1026,  1032,  1040,  1047,  1053,
-    1055,  1057,  1062,  1064,  1066,  1071,  1073,  1075,  1077,  1079,
-    1081,  1083,  1085,  1087,  1089,  1091,  1095,  1097,  1099,  1101,
-    1105,  1107,  1111,  1113,  1115,  1117,  1121,  1123,  1128,  1130,
-    1133,  1135,  1137,  1140,  1143,  1154,  1157,  1164,  1166,  1168,
-    1170,  1172,  1175,  1181,  1183,  1187,  1188,  1189,  1190,  1191,
-    1193,  1195,  1197,  1199,  1201,  1203,  1205,  1207,  1209,  1211,
-    1213,  1215,  1217,  1219,  1229,  1239,  1249,  1259,  1261,  1263,
-    1266,  1271,  1275,  1277,  1279,  1281,  1284,  1286,  1289,  1291,
-    1293,  1295,  1297,  1299,  1301,  1303,  1305,  1308,  1310,  1312,
-    1314,  1316,  1318,  1322,  1325,  1324,  1337,  1338,  1339,  1343,
-    1345,  1347,  1352,  1354,  1357,  1359,  1361,  1366,  1368,  1372,
-    1374,  1378,  1380,  1386,  1390,  1391,  1392,  1395,  1396,  1399,
-    1400,  1403,  1407,  1411,  1417,  1423,  1425,  1429,  1433,  1434,
-    1438,  1439,  1443,  1444,  1449,  1451,  1453,  1456
+     435,   434,   449,   457,   464,   466,   463,   472,   479,   478,
+     493,   497,   502,   510,   527,   529,   533,   537,   539,   541,
+     543,   545,   547,   549,   552,   557,   559,   564,   574,   576,
+     581,   587,   589,   593,   597,   601,   606,   610,   614,   615,
+     618,   624,   629,   635,   636,   640,   642,   646,   648,   650,
+     655,   657,   668,   670,   675,   677,   681,   700,   702,   704,
+     710,   775,   777,   783,   785,   789,   794,   796,   800,   802,
+     806,   810,   810,   878,   879,   884,   895,   896,   899,   910,
+     912,   914,   918,   920,   925,   929,   933,   937,   943,   948,
+     954,   960,   962,   964,   967,   966,   977,   978,   982,   986,
+     989,   994,   999,  1002,  1006,  1010,  1016,  1024,  1031,  1037,
+    1039,  1041,  1046,  1048,  1050,  1055,  1057,  1059,  1061,  1063,
+    1065,  1067,  1069,  1071,  1073,  1075,  1079,  1081,  1083,  1085,
+    1089,  1091,  1095,  1097,  1099,  1101,  1105,  1107,  1112,  1114,
+    1117,  1119,  1121,  1124,  1127,  1138,  1141,  1148,  1150,  1152,
+    1154,  1156,  1159,  1165,  1167,  1171,  1172,  1173,  1174,  1175,
+    1177,  1179,  1181,  1183,  1185,  1187,  1189,  1191,  1193,  1195,
+    1197,  1199,  1201,  1203,  1213,  1223,  1233,  1243,  1245,  1247,
+    1250,  1255,  1259,  1261,  1263,  1265,  1268,  1270,  1273,  1275,
+    1277,  1279,  1281,  1283,  1285,  1287,  1289,  1292,  1294,  1296,
+    1298,  1300,  1302,  1306,  1309,  1308,  1321,  1322,  1323,  1327,
+    1329,  1331,  1336,  1338,  1341,  1343,  1345,  1350,  1352,  1356,
+    1358,  1362,  1364,  1370,  1374,  1375,  1376,  1379,  1380,  1383,
+    1384,  1387,  1391,  1395,  1401,  1407,  1409,  1413,  1417,  1418,
+    1422,  1423,  1427,  1428,  1433,  1435,  1437,  1440
 };
 #endif
 
@@ -1168,6 +1168,6 @@ static const toketypes yy_type_tab[] =
 };
 
 /* Generated from:
- * 672539c523be1568df09c599b38a828c80473c60e1fddd63764d66f74e4e7b11 perly.y
+ * 427b422b0ce1154d834dc461973a3254729575694f98ab600032f67ccab7b9e5 perly.y
  * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.y b/perly.y
index 42156e3a42..184fb0c158 100644
--- a/perly.y
+++ b/perly.y
@@ -466,24 +466,8 @@ barestmt:	PLUGSTMT
 			{ parser->in_my = 0; intro_my(); }
 		PERLY_PAREN_CLOSE mblock[catch]
 			{
-			  OP *tryblock, *catchblock;
-			  
-			  tryblock = newUNOP(OP_ENTERTRY, OPf_SPECIAL, $try);
-
-			  catchblock = newLOGOP(OP_CATCH, 0,
-			    newOP(OP_NULL, 0), /* LOGOP always needs an op_first */
-			    block_end($remember, op_scope($catch)));
-
-			  /* catchblock itself is an OP_NULL; the real OP_CATCH is
-			   * its op_first */
-			  assert(cUNOPx(catchblock)->op_first->op_type == OP_CATCH);
-			  cUNOPx(catchblock)->op_first->op_targ = $scalar->op_targ;
-			  op_free($scalar);
-
-			  $$ = op_append_list(OP_LEAVE,
-			    newOP(OP_ENTER, 0),
-			    op_append_list(OP_LINESEQ,
-			      tryblock, catchblock));
+			  $$ = newTRYCATCHOP(0,
+				  $try, $scalar, block_end($remember, op_scope($catch)));
 			}
 	|	block cont
 			{
diff --git a/pp_ctl.c b/pp_ctl.c
index 6ef2ba17bb..a480bb762d 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2486,16 +2486,6 @@ PP(pp_return)
     PERL_CONTEXT *cx;
     I32 cxix = dopopto_cursub();
 
-again:
-    if (cxix >= 0) {
-        cx = &cxstack[cxix];
-        if (CxTRY(cx)) {
-            /* This was a try {}. keep going */
-            cxix = dopoptosub_at(cxstack, cxix - 1);
-            goto again;
-        }
-    }
-
     assert(cxstack_ix >= 0);
     if (cxix < cxstack_ix) {
         if (cxix < 0) {
@@ -4616,15 +4606,52 @@ PP(pp_leaveeval)
     return retop;
 }
 
+/* Ops that implement try/catch syntax
+ * Note the asymmetry here:
+ *   pp_entertrycatch does two pushblocks
+ *   pp_leavetrycatch pops only the outer one; the inner one is popped by
+ *     pp_poptry or by stack-unwind of die within the try block
+ */
+
+PP(pp_entertrycatch)
+{
+    PERL_CONTEXT *cx;
+    const U8 gimme = GIMME_V;
+
+    RUN_PP_CATCHABLY(Perl_pp_entertrycatch);
+
+    assert(!CATCH_GET);
+
+    Perl_pp_enter(aTHX); /* performs cx_pushblock(CXt_BLOCK, ...) */
+
+    save_scalar(PL_errgv);
+    CLEAR_ERRSV();
+
+    cx = cx_pushblock((CXt_EVAL|CXp_EVALBLOCK|CXp_TRY), gimme,
+            PL_stack_sp, PL_savestack_ix);
+    cx_pushtry(cx, cLOGOP->op_other);
+
+    PL_in_eval = EVAL_INEVAL;
+
+    return NORMAL;
+}
+
+PP(pp_leavetrycatch)
+{
+    /* leavetrycatch is leave */
+    return Perl_pp_leave(aTHX);
+}
+
+PP(pp_poptry)
+{
+    /* poptry is leavetry */
+    return Perl_pp_leavetry(aTHX);
+}
+
 PP(pp_catch)
 {
     dTARGET;
 
-    if(!SvROK(ERRSV) && !SvTRUE(ERRSV)) {
-        /* ERRSV is neither an object nor true, therefore no exception happened */
-        return cLOGOP->op_next;
-    }
-
     save_clearsv(&(PAD_SVl(PL_op->op_targ)));
     sv_setsv(TARG, ERRSV);
     CLEAR_ERRSV();
@@ -4676,22 +4703,7 @@ PP(pp_entertry)
 
     assert(!CATCH_GET);
 
-    if(PL_op->op_flags & OPf_SPECIAL) { /* a try {} block */
-        PERL_CONTEXT *cx;
-        const U8 gimme = GIMME_V;
-
-        save_scalar(PL_errgv);
-        CLEAR_ERRSV();
-
-        cx = cx_pushblock((CXt_EVAL|CXp_EVALBLOCK|CXp_TRY), gimme,
-                        PL_stack_sp, PL_savestack_ix);
-        cx_pusheval(cx, retop, NULL);
-
-        PL_in_eval = EVAL_INEVAL;
-    }
-    else {                              /* an eval {} block */
-        create_eval_scope(retop, 0);
-    }
+    create_eval_scope(retop, 0);
 
     return PL_op->op_next;
 }
@@ -4723,7 +4735,7 @@ PP(pp_leavetry)
     CX_LEAVE_SCOPE(cx);
     cx_popeval(cx);
     cx_popblock(cx);
-    retop = cx->blk_eval.retop;
+    retop = CxTRY(cx) ? PL_op->op_next : cx->blk_eval.retop;
     CX_POP(cx);
 
     CLEAR_ERRSV();
diff --git a/pp_proto.h b/pp_proto.h
index 48558d31c2..a9bda73e3c 100644
--- a/pp_proto.h
+++ b/pp_proto.h
@@ -67,6 +67,7 @@ PERL_CALLCONV OP *Perl_pp_enteriter(pTHX);
 PERL_CALLCONV OP *Perl_pp_enterloop(pTHX);
 PERL_CALLCONV OP *Perl_pp_entersub(pTHX);
 PERL_CALLCONV OP *Perl_pp_entertry(pTHX);
+PERL_CALLCONV OP *Perl_pp_entertrycatch(pTHX);
 PERL_CALLCONV OP *Perl_pp_enterwhen(pTHX);
 PERL_CALLCONV OP *Perl_pp_enterwrite(pTHX);
 PERL_CALLCONV OP *Perl_pp_eof(pTHX);
@@ -144,6 +145,7 @@ PERL_CALLCONV OP *Perl_pp_leaveloop(pTHX);
 PERL_CALLCONV OP *Perl_pp_leavesub(pTHX);
 PERL_CALLCONV OP *Perl_pp_leavesublv(pTHX);
 PERL_CALLCONV OP *Perl_pp_leavetry(pTHX);
+PERL_CALLCONV OP *Perl_pp_leavetrycatch(pTHX);
 PERL_CALLCONV OP *Perl_pp_leavewhen(pTHX);
 PERL_CALLCONV OP *Perl_pp_leavewrite(pTHX);
 PERL_CALLCONV OP *Perl_pp_left_shift(pTHX);
@@ -192,6 +194,7 @@ PERL_CALLCONV OP *Perl_pp_padhv(pTHX);
 PERL_CALLCONV OP *Perl_pp_padrange(pTHX);
 PERL_CALLCONV OP *Perl_pp_padsv(pTHX);
 PERL_CALLCONV OP *Perl_pp_pipe_op(pTHX);
+PERL_CALLCONV OP *Perl_pp_poptry(pTHX);
 PERL_CALLCONV OP *Perl_pp_pos(pTHX);
 PERL_CALLCONV OP *Perl_pp_postdec(pTHX);
 PERL_CALLCONV OP *Perl_pp_postinc(pTHX);
diff --git a/proto.h b/proto.h
index 29385e45fb..faca6d1366 100644
--- a/proto.h
+++ b/proto.h
@@ -652,6 +652,11 @@ PERL_CALLCONV OP *	Perl_ck_trunc(pTHX_ OP *o)
 #define PERL_ARGS_ASSERT_CK_TRUNC	\
 	assert(o)
 
+PERL_CALLCONV OP *	Perl_ck_trycatch(pTHX_ OP *o)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_CK_TRYCATCH	\
+	assert(o)
+
 PERL_CALLCONV void	Perl_ck_warner(pTHX_ U32 err, const char* pat, ...)
 			__attribute__format__(__printf__,pTHX_2,pTHX_3);
 #define PERL_ARGS_ASSERT_CK_WARNER	\
@@ -2483,6 +2488,11 @@ PERL_CALLCONV SV*	Perl_newSVuv(pTHX_ const UV u)
 			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWSVUV
 
+PERL_CALLCONV OP*	Perl_newTRYCATCHOP(pTHX_ I32 flags, OP* tryblock, OP *catchvar, OP* catchblock)
+			__attribute__warn_unused_result__;
+#define PERL_ARGS_ASSERT_NEWTRYCATCHOP	\
+	assert(tryblock); assert(catchvar); assert(catchblock)
+
 PERL_CALLCONV OP*	Perl_newUNOP(pTHX_ I32 type, I32 flags, OP* first)
 			__attribute__warn_unused_result__;
 #define PERL_ARGS_ASSERT_NEWUNOP
@@ -4469,6 +4479,11 @@ PERL_STATIC_INLINE void	Perl_cx_pushsub(pTHX_ PERL_CONTEXT *cx, CV *cv, OP *reto
 	assert(cx); assert(cv)
 #endif
 #ifndef PERL_NO_INLINE_FUNCTIONS
+PERL_STATIC_INLINE void	Perl_cx_pushtry(pTHX_ PERL_CONTEXT *cx, OP *retop);
+#define PERL_ARGS_ASSERT_CX_PUSHTRY	\
+	assert(cx)
+#endif
+#ifndef PERL_NO_INLINE_FUNCTIONS
 PERL_STATIC_INLINE void	Perl_cx_pushwhen(pTHX_ PERL_CONTEXT *cx);
 #define PERL_ARGS_ASSERT_CX_PUSHWHEN	\
 	assert(cx)
diff --git a/regen/opcodes b/regen/opcodes
index 2a2da77c5c..6a3f8db024 100644
--- a/regen/opcodes
+++ b/regen/opcodes
@@ -578,4 +578,7 @@ isa		derived class test	ck_isa		s2
 cmpchain_and	comparison chaining	ck_null		|
 cmpchain_dup	comparand shuffling	ck_null		1
 
+entertrycatch	try {block}		ck_trycatch	|
+leavetrycatch	try {block} exit	ck_null		@
+poptry		pop try			ck_null		@
 catch		catch {} block		ck_null		|
diff --git a/t/op/try.t b/t/op/try.t
index 90702fe958..fe17a1ff42 100644
--- a/t/op/try.t
+++ b/t/op/try.t
@@ -195,4 +195,28 @@ no warnings 'experimental::try';
     }
 }
 
+# return from try is correct even for :lvalue subs
+#   https://github.com/Perl/perl5/issues/18553
+{
+    my $scalar;
+    sub fscalar :lvalue
+    {
+        try { return $scalar }
+        catch ($e) { }
+    }
+
+    fscalar = 123;
+    is($scalar, 123, 'try { return } in :lvalue sub in scalar context' );
+
+    my @array;
+    sub flist :lvalue
+    {
+        try { return @array }
+        catch ($e) { }
+    }
+
+    (flist) = (4, 5, 6);
+    ok(eq_array(\@array, [4, 5, 6]), 'try { return } in :lvalue sub in list context' );
+}
+
 done_testing;