[inseparable changes from patch from perl5.003_12 to perl5.003_13]

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

diff --git a/pp.h b/pp.h
index 44a3ebe..56cd26c 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -55,24 +55,26 @@
 #define POPp           (SvPVx(POPs, na))
 #define POPn           (SvNVx(POPs))
 #define POPi           ((IV)SvIVx(POPs))
+#define POPu           ((UV)SvUVx(POPs))
 #define POPl           ((long)SvIVx(POPs))
 
 #define TOPs           (*sp)
 #define TOPp           (SvPV(TOPs, na))
 #define TOPn           (SvNV(TOPs))
 #define TOPi           ((IV)SvIV(TOPs))
+#define TOPu           ((UV)SvUV(TOPs))
 #define TOPl           ((long)SvIV(TOPs))
 
 /* Go to some pains in the rare event that we must extend the stack. */
-#define EXTEND(p,n)    STMT_START { if (stack_max - p < (n)) {                     \
-                           sp = stack_grow(sp,p, (int) (n));               \
+#define EXTEND(p,n)    STMT_START { if (stack_max - p < (n)) {         \
+                           sp = stack_grow(sp,p, (int) (n));           \
                        } } STMT_END
 
 /* Same thing, but update mark register too. */
-#define MEXTEND(p,n)   STMT_START {if (stack_max - p < (n)) {                      \
-                           int markoff = mark - stack_base;                \
-                           sp = stack_grow(sp,p,(int) (n));                \
-                           mark = stack_base + markoff;                    \
+#define MEXTEND(p,n)   STMT_START {if (stack_max - p < (n)) {          \
+                           int markoff = mark - stack_base;            \
+                           sp = stack_grow(sp,p,(int) (n));            \
+                           mark = stack_base + markoff;                \
                        } } STMT_END
 
 #define PUSHs(s)       (*++sp = (s))
@@ -80,22 +82,21 @@
 #define PUSHp(p,l)     STMT_START { sv_setpvn(TARG, (p), (l)); PUSHTARG; } STMT_END
 #define PUSHn(n)       STMT_START { sv_setnv(TARG, (double)(n)); PUSHTARG; } STMT_END
 #define PUSHi(i)       STMT_START { sv_setiv(TARG, (IV)(i)); PUSHTARG; } STMT_END
+#define PUSHu(u)       STMT_START { sv_setuv(TARG, (UV)(u)); PUSHTARG; } STMT_END
 
 #define XPUSHs(s)      STMT_START { EXTEND(sp,1); (*++sp = (s)); } STMT_END
 #define XPUSHTARG      STMT_START { SvSETMAGIC(TARG); XPUSHs(TARG); } STMT_END
 #define XPUSHp(p,l)    STMT_START { sv_setpvn(TARG, (p), (l)); XPUSHTARG; } STMT_END
 #define XPUSHn(n)      STMT_START { sv_setnv(TARG, (double)(n)); XPUSHTARG; } STMT_END
 #define XPUSHi(i)      STMT_START { sv_setiv(TARG, (IV)(i)); XPUSHTARG; } STMT_END
+#define XPUSHu(u)      STMT_START { sv_setuv(TARG, (UV)(u)); XPUSHTARG; } STMT_END
 
 #define SETs(s)                (*sp = s)
 #define SETTARG                STMT_START { SvSETMAGIC(TARG); SETs(TARG); } STMT_END
 #define SETp(p,l)      STMT_START { sv_setpvn(TARG, (p), (l)); SETTARG; } STMT_END
 #define SETn(n)                STMT_START { sv_setnv(TARG, (double)(n)); SETTARG; } STMT_END
 #define SETi(i)                STMT_START { sv_setiv(TARG, (IV)(i)); SETTARG; } STMT_END
-
-#ifdef OVERLOAD
-#define SETsv(sv)      STMT_START { sv_setsv(TARG, (sv)); SETTARG; } STMT_END
-#endif /* OVERLOAD */
+#define SETu(u)                STMT_START { sv_setuv(TARG, (UV)(u)); SETTARG; } STMT_END
 
 #define dTOPss         SV *sv = TOPs
 #define dPOPss         SV *sv = POPs
@@ -103,6 +104,8 @@
 #define dPOPnv         double value = POPn
 #define dTOPiv         IV value = TOPi
 #define dPOPiv         IV value = POPi
+#define dTOPuv         UV value = TOPu
+#define dPOPuv         UV value = POPu
 
 #define dPOPPOPssrl    SV *right = POPs; SV *left = POPs
 #define dPOPPOPnnrl    double right = POPn; double left = POPn
@@ -127,7 +130,13 @@
                                stack_base = AvARRAY(t);                \
                                stack_max = stack_base + AvMAX(t);      \
                                sp = stack_sp = stack_base + AvFILL(t); \
-                               stack = t;
+                               curstack = t;
+
+#define EXTEND_MORTAL(n) \
+       STMT_START { \
+           if (tmps_ix + (n) >= tmps_max) \
+               Renew(tmps_stack, tmps_max = tmps_ix + (n) + 1, SV*); \
+       } STMT_END
 
 #ifdef OVERLOAD
 
@@ -169,10 +178,13 @@
          } \
        } STMT_END
 
-#define tryAMAGICun(meth) tryAMAGICunW(meth,SETsv)
+#define tryAMAGICun    tryAMAGICunSET
 #define tryAMAGICunSET(meth) tryAMAGICunW(meth,SETs)
 
 #define opASSIGN (op->op_flags & OPf_STACKED)
+#define SETsv(sv)      STMT_START {                                    \
+               if (opASSIGN) { sv_setsv(TARG, (sv)); SETTARG; }        \
+               else SETs(sv); } STMT_END
 
 /* newSVsv does not behave as advertised, so we copy missing
  * information by hand */