X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/a0d0e21ea6ea90a22318550944fe6cb09ae10cda..820c3be929853f3a88443f652f155f66eddf98ea:/cop.h

diff --git a/cop.h b/cop.h
index 5a04e41..b503309 100644
--- a/cop.h
+++ b/cop.h
@@ -42,8 +42,9 @@ struct block_sub {
 #define PUSHFORMAT(cx)							\
 	cx->blk_sub.cv = cv;						\
 	cx->blk_sub.gv = gv;						\
+	cx->blk_sub.hasargs = 0;					\
 	cx->blk_sub.dfoutgv = defoutgv;					\
-	cx->blk_sub.hasargs = 0;
+	(void)SvREFCNT_inc(cx->blk_sub.dfoutgv)
 
 #define POPSUB(cx)							\
 	if (cx->blk_sub.hasargs) {   /* put back old @_ */		\
@@ -56,7 +57,8 @@ struct block_sub {
 	}
 
 #define POPFORMAT(cx)							\
-	defoutgv = cx->blk_sub.dfoutgv;
+	setdefout(cx->blk_sub.dfoutgv);					\
+	SvREFCNT_dec(cx->blk_sub.dfoutgv);
 
 /* eval context */
 struct block_eval {
@@ -64,13 +66,15 @@ struct block_eval {
     I32		old_op_type;
     char *	old_name;
     OP *	old_eval_root;
+    SV *	cur_text;
 };
 
 #define PUSHEVAL(cx,n,fgv)						\
 	cx->blk_eval.old_in_eval = in_eval;				\
 	cx->blk_eval.old_op_type = op->op_type;				\
 	cx->blk_eval.old_name = n;					\
-	cx->blk_eval.old_eval_root = eval_root;
+	cx->blk_eval.old_eval_root = eval_root;				\
+	cx->blk_eval.cur_text = linestr;
 
 #define POPEVAL(cx)							\
 	in_eval = cx->blk_eval.old_in_eval;				\
@@ -101,9 +105,7 @@ struct block_loop {
 	    cx->blk_loop.itersave = *cx->blk_loop.itervar;
 
 #define POPLOOP(cx)							\
-	newsp		= stack_base + cx->blk_loop.resetsp;		\
-	if (cx->blk_loop.itervar)					\
-	    *cx->blk_loop.itervar = cx->blk_loop.itersave;
+	newsp		= stack_base + cx->blk_loop.resetsp;
 
 /* context common to subroutines, evals and loops */
 struct block {
@@ -170,6 +172,7 @@ struct subst {
     I32		sbu_maxiters;
     I32		sbu_safebase;
     I32		sbu_once;
+    I32		sbu_oldsave;
     char *	sbu_orig;
     SV *	sbu_dstr;
     SV *	sbu_targ;
@@ -177,11 +180,13 @@ struct subst {
     char *	sbu_m;
     char *	sbu_strend;
     char *	sbu_subbase;
+    REGEXP *	sbu_rx;
 };
 #define sb_iters	cx_u.cx_subst.sbu_iters
 #define sb_maxiters	cx_u.cx_subst.sbu_maxiters
 #define sb_safebase	cx_u.cx_subst.sbu_safebase
 #define sb_once		cx_u.cx_subst.sbu_once
+#define sb_oldsave	cx_u.cx_subst.sbu_oldsave
 #define sb_orig		cx_u.cx_subst.sbu_orig
 #define sb_dstr		cx_u.cx_subst.sbu_dstr
 #define sb_targ		cx_u.cx_subst.sbu_targ
@@ -189,18 +194,21 @@ struct subst {
 #define sb_m		cx_u.cx_subst.sbu_m
 #define sb_strend	cx_u.cx_subst.sbu_strend
 #define sb_subbase	cx_u.cx_subst.sbu_subbase
+#define sb_rx		cx_u.cx_subst.sbu_rx
 
 #define PUSHSUBST(cx) CXINC, cx = &cxstack[cxstack_ix],			\
 	cx->sb_iters		= iters,				\
 	cx->sb_maxiters		= maxiters,				\
 	cx->sb_safebase		= safebase,				\
 	cx->sb_once		= once,					\
+	cx->sb_oldsave		= oldsave,				\
 	cx->sb_orig		= orig,					\
 	cx->sb_dstr		= dstr,					\
 	cx->sb_targ		= targ,					\
 	cx->sb_s		= s,					\
 	cx->sb_m		= m,					\
 	cx->sb_strend		= strend,				\
+	cx->sb_rx		= rx,					\
 	cx->cx_type		= CXt_SUBST
 
 #define POPSUBST(cx) cxstack_ix--
@@ -229,3 +237,4 @@ struct context {
 #define G_DISCARD	2	/* Call FREETMPS. */
 #define G_EVAL		4	/* Assume eval {} around subroutine call. */
 #define G_NOARGS	8	/* Don't construct a @_ array. */
+#define G_KEEPERR      16	/* Append errors to $@ rather than overwriting it */