First pass at finalising perldelta, removing unrequired boilerplate

[perl5.git] / pp.h

diff --git a/pp.h b/pp.h
index e4bcb4d..4e663ba 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -425,44 +425,37 @@ Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
            return NORMAL; \
     } STMT_END
 
-#define AMG_CALLun_var(sv,meth_enum) amagic_call(sv,&PL_sv_undef,  \
-                                       meth_enum,AMGf_noright | AMGf_unary)
-#define AMG_CALLun(sv,meth) AMG_CALLun_var(sv,CAT2(meth,_amg))
-
-#define tryAMAGICunW_var(meth_enum,set,shift,ret) STMT_START { \
-           SV* tmpsv; \
-           SV* arg= sp[shift]; \
-          if(0) goto am_again;  /* shut up unused warning */ \
-         am_again: \
-           if ((SvAMAGIC(arg))&&\
-               (tmpsv=AMG_CALLun_var(arg,(meth_enum)))) {\
-              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
-
-#define setAGAIN(ref)  \
-    STMT_START {                                       \
-       sv = ref;                                       \
-       if (!SvROK(ref))                                \
-           Perl_croak(aTHX_ "Overloaded dereference did not return a reference");      \
-       if (ref != arg && SvRV(ref) != SvRV(arg)) {     \
-           arg = ref;                                  \
-           goto am_again;                              \
-       }                                               \
+#define AMG_CALLun(sv,meth) \
+    amagic_call(sv,&PL_sv_undef, CAT2(meth,_amg), AMGf_noright | AMGf_unary)
+
+#define tryAMAGICunTARGET(meth, shift)                         \
+    STMT_START {                                               \
+       dSP;                                                    \
+       sp--; /* get TARGET from below PL_stack_sp */           \
+       {                                                       \
+           dTARGETSTACKED;                                     \
+           dSP;                                                \
+           SV *tmpsv;                                          \
+           SV *arg= sp[shift];                                 \
+           if (SvAMAGIC(arg) &&                                \
+               (tmpsv = amagic_call(arg, &PL_sv_undef, CAT2(meth,_amg), \
+                                    AMGf_noright | AMGf_unary))) {     \
+               SPAGAIN;                                        \
+               sp += shift;                                    \
+               sv_setsv(TARG, tmpsv);                          \
+               SETTARG;                                        \
+               RETURN;                                         \
+           }                                                   \
+       }                                                       \
     } STMT_END
 
-#define tryAMAGICunDEREF(meth) tryAMAGICunW(meth,setAGAIN,0,(void)0)
-#define tryAMAGICunDEREF_var(meth_enum) \
-       tryAMAGICunW_var(meth_enum,setAGAIN,0,(void)0)
+/* This is no longer used anywhere in the core. You might wish to consider
+   calling amagic_deref_call() directly, as it has a cleaner interface.  */
+#define tryAMAGICunDEREF(meth)                                         \
+    STMT_START {                                                       \
+       sv = amagic_deref_call(*sp, CAT2(meth,_amg));                   \
+       SPAGAIN;                                                        \
+    } STMT_END
 
 
 #define opASSIGN (PL_op->op_flags & OPf_STACKED)
@@ -476,18 +469,6 @@ Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
                   { sv_setsv(TARG, (sv)); SETTARG; }                   \
                else SETs(sv); } STMT_END
 
-/* newSVsv does not behave as advertised, so we copy missing
- * information by hand */
-
-/* SV* ref causes confusion with the member variable
-   changed SV* ref to SV* tmpRef */
-#define RvDEEPCP(rv) STMT_START { SV* tmpRef=SvRV(rv); SV* rv_copy;     \
-  if (SvREFCNT(tmpRef)>1 && (rv_copy = AMG_CALLun(rv,copy))) {          \
-    SvRV_set(rv, rv_copy);                 \
-    SvSETMAGIC(rv);                        \
-    SvREFCNT_dec(tmpRef);                   \
-  } } STMT_END
-
 /*
 =for apidoc mU||LVRET
 True if this op will be the return value of an lvalue subroutine