From acd8228ca9adfb506acce4c989674b8efb985f9b Mon Sep 17 00:00:00 2001 From: Nicholas Clark Date: Tue, 2 Nov 2010 14:09:48 +0000 Subject: Eliminate tryAMAGICunW() by refactoring tryAMAGICun{DEREF,TARGET} tryAMAGICunW was only used within pp.h itself, and not referenced from anywhere else. (The core, CPAN, code visible to Google codesearch.) --- pp.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'pp.h') diff --git a/pp.h b/pp.h index e4bcb4d49b..8ed4001208 100644 --- a/pp.h +++ b/pp.h @@ -439,15 +439,13 @@ Does not use C. See also C, C and C. SPAGAIN; if (shift) sp += shift; \ set(tmpsv); ret; } \ } STMT_END -#define tryAMAGICunW(meth,set,shift,ret) \ - tryAMAGICunW_var(CAT2(meth,_amg),set,shift,ret) #define FORCE_SETs(sv) STMT_START { sv_setsv(TARG, (sv)); SETTARG; } STMT_END #define tryAMAGICunTARGET(meth, shift) \ STMT_START { dSP; sp--; /* get TARGET from below PL_stack_sp */ \ { dTARGETSTACKED; \ - { dSP; tryAMAGICunW(meth,FORCE_SETs,shift,RETURN);}}} STMT_END + { dSP; tryAMAGICunW_var(CAT2(meth,_amg),FORCE_SETs,shift,RETURN);}}} STMT_END #define setAGAIN(ref) \ STMT_START { \ @@ -460,9 +458,9 @@ Does not use C. See also C, C and C. } \ } STMT_END -#define tryAMAGICunDEREF(meth) tryAMAGICunW(meth,setAGAIN,0,(void)0) #define tryAMAGICunDEREF_var(meth_enum) \ tryAMAGICunW_var(meth_enum,setAGAIN,0,(void)0) +#define tryAMAGICunDEREF(meth) tryAMAGICunDEREF_var(CAT2(meth,_amg)) #define opASSIGN (PL_op->op_flags & OPf_STACKED) -- cgit v1.2.1