X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=pp.h;h=79922596bd86ee6620e070d405a077f645e752a6;hb=3246d7a3ad86dfa806dd7e514ae5fd2dacd5c0ef;hp=1ca2fabc8c0a7456ccfc435344f145ec44464c21;hpb=8c074e2aa6f4be490d6bedf1bc337b09fa1c1185;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/pp.h b/pp.h
index 1ca2fab..7992259 100644
--- a/pp.h
+++ b/pp.h
@@ -87,7 +87,6 @@ Refetch the stack pointer.  Used after a callback.  See L<perlcall>.
 
 #define NORMAL PL_op->op_next
 #define DIE return Perl_die
-#define DIE_NULL return DieNull
 
 /*
 =for apidoc Ams||PUTBACK
@@ -142,7 +141,7 @@ Pops a long off the stack.
 #define TOPm1s		(*(sp-1))
 #define TOPp1s		(*(sp+1))
 #define TOPp		(SvPV(TOPs, PL_na))		/* deprecated */
-#define TOPpx		(SvPV(TOPs, n_a))
+#define TOPpx		(SvPV_nolen(TOPs))
 #define TOPn		(SvNV(TOPs))
 #define TOPi		((IV)SvIV(TOPs))
 #define TOPu		((UV)SvUV(TOPs))
@@ -283,8 +282,8 @@ and C<PUSHu>.
 			} } STMT_END
 
 /* Same thing, but update mark register too. */
-#define MEXTEND(p,n)	STMT_START {if (PL_stack_max - p < (int)(n)) {		\
-			    int markoff = mark - PL_stack_base;		\
+#define MEXTEND(p,n)	STMT_START {if (PL_stack_max - p < (int)(n)) {	\
+			    const int markoff = mark - PL_stack_base;	\
 			    sp = stack_grow(sp,p,(int) (n));		\
 			    mark = PL_stack_base + markoff;		\
 			} } STMT_END
@@ -398,30 +397,35 @@ and C<PUSHu>.
 #define AMGf_assign	4
 #define AMGf_unary	8
 
-#define tryAMAGICbinW(meth,assign,set) STMT_START { \
-          if (PL_amagic_generation) { \
-	    SV* tmpsv; \
-	    SV* right= *(sp); SV* left= *(sp-1);\
-	    if ((SvAMAGIC(left)||SvAMAGIC(right))&&\
-		(tmpsv=amagic_call(left, \
+#define tryAMAGICbinW_var(meth_enum,assign,set) STMT_START { \
+	    SV* const left = *(sp-1); \
+	    SV* const right = *(sp); \
+	    if ((SvAMAGIC(left)||SvAMAGIC(right))) {\
+		SV * const tmpsv = amagic_call(left, \
 				   right, \
-				   CAT2(meth,_amg), \
-				   (assign)? AMGf_assign: 0))) {\
-	       SPAGAIN;	\
-	       (void)POPs; set(tmpsv); RETURN; } \
-	  } \
+				   meth_enum, \
+				   (assign)? AMGf_assign: 0); \
+		if (tmpsv) { \
+		    SPAGAIN; \
+		    (void)POPs; set(tmpsv); RETURN; } \
+		} \
 	} STMT_END
 
+#define tryAMAGICbinW(meth,assign,set) \
+    tryAMAGICbinW_var(CAT2(meth,_amg),assign,set)
+
 #define tryAMAGICbin(meth,assign) tryAMAGICbinW(meth,assign,SETsv)
 #define tryAMAGICbinSET(meth,assign) tryAMAGICbinW(meth,assign,SETs)
 
+#define tryAMAGICbinSET_var(meth_enum,assign) \
+    tryAMAGICbinW_var(meth_enum,assign,SETs)
+
 #define AMG_CALLun(sv,meth) amagic_call(sv,&PL_sv_undef,  \
 					CAT2(meth,_amg),AMGf_noright | AMGf_unary)
 #define AMG_CALLbinL(left,right,meth) \
             amagic_call(left,right,CAT2(meth,_amg),AMGf_noright)
 
 #define tryAMAGICunW(meth,set,shift,ret) STMT_START { \
-          if (PL_amagic_generation) { \
 	    SV* tmpsv; \
 	    SV* arg= sp[shift]; \
           if(0) goto am_again;  /* shut up unused warning */ \
@@ -430,7 +434,6 @@ and C<PUSHu>.
 		(tmpsv=AMG_CALLun(arg,meth))) {\
 	       SPAGAIN; if (shift) sp += shift; \
 	       set(tmpsv); ret; } \
-	  } \
 	} STMT_END
 
 #define FORCE_SETs(sv) STMT_START { sv_setsv(TARG, (sv)); SETTARG; } STMT_END
@@ -483,3 +486,13 @@ True if this op will be the return value of an lvalue subroutine
 
 =cut */
 #define LVRET ((PL_op->op_private & OPpMAYBE_LVSUB) && is_lvalue_sub())
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */