Update Archive-Extract to cpan version 0.38

[p5sagit/p5-mst-13.2.git] / pp.h

diff --git a/pp.h b/pp.h
index 50fec83..9d078af 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -86,7 +86,7 @@ Refetch the stack pointer.  Used after a callback.  See L<perlcall>.
 #define dTARG SV *targ
 
 #define NORMAL PL_op->op_next
-#define DIE return Perl_die
+#define DIE Perl_die
 
 /*
 =for apidoc Ams||PUTBACK
@@ -473,6 +473,7 @@ Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
 
 #define tryAMAGICftest(chr)                            \
     STMT_START {                                       \
+       assert(chr != '?');                             \
        if (SvAMAGIC(TOPs)) {                           \
            const char tmpchr = (chr);                  \
            SV * const tmpsv = amagic_call(TOPs,        \
@@ -480,7 +481,19 @@ Does not use C<TARG>.  See also C<XPUSHu>, C<mPUSHu> and C<PUSHu>.
                ftest_amg, AMGf_unary);                 \
                                                        \
            if (tmpsv) {                                \
+               const OP *next = PL_op->op_next;        \
+                                                       \
                SPAGAIN;                                \
+                                                       \
+               if (next->op_type >= OP_FTRREAD &&      \
+                   next->op_type <= OP_FTBINARY &&     \
+                   next->op_private & OPpFT_STACKED    \
+               ) {                                     \
+                   if (SvTRUE(tmpsv))                  \
+                       /* leave the object alone */    \
+                       RETURN;                         \
+               }                                       \
+                                                       \
                SETs(tmpsv);                            \
                RETURN;                                 \
            }                                           \