This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
reindent tryAMAGICunTARGET after previous change
[perl5.git] / pp.h
diff --git a/pp.h b/pp.h
index 4d03953..f3368f7 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -431,31 +431,27 @@ Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
 /* No longer used in core. Use AMG_CALLunary instead */
 #define AMG_CALLun(sv,meth) AMG_CALLunary(sv, CAT2(meth,_amg))
 
-#define tryAMAGICunTARGET(meth, shift, jump)                           \
+#define tryAMAGICunTARGET(meth, shift, jump)                   \
     STMT_START {                                               \
+       dATARGET;                                               \
        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, meth,   \
-                                    AMGf_noright | AMGf_unary))) {     \
-               SPAGAIN;                                        \
-               sp += shift;                                    \
-               sv_setsv(TARG, tmpsv);                          \
-               if (opASSIGN)                                   \
-                   sp--;                                       \
-               SETTARG;                                        \
-               PUTBACK;                                        \
-               if (jump) {                                     \
-                   PL_markstack_ptr--;                         \
-                   return NORMAL->op_next->op_next;            \
-               }                                               \
-               return NORMAL;                                  \
+       SV *tmpsv;                                              \
+       SV *arg= sp[shift];                                     \
+       if (SvAMAGIC(arg) &&                                    \
+           (tmpsv = amagic_call(arg, &PL_sv_undef, meth,       \
+                                AMGf_noright | AMGf_unary))) { \
+           SPAGAIN;                                            \
+           sp += shift;                                        \
+           sv_setsv(TARG, tmpsv);                              \
+           if (opASSIGN)                                       \
+               sp--;                                           \
+           SETTARG;                                            \
+           PUTBACK;                                            \
+           if (jump) {                                         \
+               PL_markstack_ptr--;                             \
+               return NORMAL->op_next->op_next;                \
            }                                                   \
+           return NORMAL;                                      \
        }                                                       \
     } STMT_END