X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cop.h;h=bea47c4c6aeb7aee0ac16c2532a410459b4f7faa;hb=acf072cefd91b26e35138b2b22ee4f7b516c9171;hp=3953dd47b9634fabfc791169c6df5c6fcb85f089;hpb=748a93069b3d16374a9859d1456065dd3ae11394;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/cop.h b/cop.h
index 3953dd4..bea47c4 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 @_ */		\
@@ -51,12 +52,16 @@ struct block_sub {
 	}								\
 	if (cx->blk_sub.cv) {						\
 	    if (!(CvDEPTH(cx->blk_sub.cv) = cx->blk_sub.olddepth)) {	\
+	        if (cx->blk_sub.hasargs) {				\
+	    	    SvREFCNT_inc((SV*)cx->blk_sub.argarray);		\
+		}							\
 		SvREFCNT_dec((SV*)cx->blk_sub.cv);			\
 	    }								\
 	}
 
 #define POPFORMAT(cx)							\
-	defoutgv = cx->blk_sub.dfoutgv;
+	setdefout(cx->blk_sub.dfoutgv);					\
+	SvREFCNT_dec(cx->blk_sub.dfoutgv);
 
 /* eval context */
 struct block_eval {
@@ -103,9 +108,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 {
@@ -172,6 +175,7 @@ struct subst {
     I32		sbu_maxiters;
     I32		sbu_safebase;
     I32		sbu_once;
+    I32		sbu_oldsave;
     char *	sbu_orig;
     SV *	sbu_dstr;
     SV *	sbu_targ;
@@ -179,11 +183,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
@@ -191,18 +197,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--
@@ -231,3 +240,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 */