[win32] fix typo in Makefile

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

diff --git a/pp.h b/pp.h
index 56cd26c..2209fee 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -1,16 +1,20 @@
 /*    pp.h
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
  */
 
+#ifdef USE_THREADS
+#define ARGS thr
+#define dARGS struct perl_thread *thr;
+#else
 #define ARGS
-#define ARGSproto void
 #define dARGS
-#define PP(s) OP* s(ARGS) dARGS
+#endif /* USE_THREADS */
+#define PP(s) OP * s(ARGSproto)
 
 #define SP sp
 #define MARK mark
@@ -23,7 +27,8 @@
 #define TOPMARK                (*markstack_ptr)
 #define POPMARK                (*markstack_ptr--)
 
-#define dSP            register SV **sp = stack_sp
+#define djSP           register SV **sp = stack_sp
+#define dSP            dTHR; djSP
 #define dMARK          register SV **mark = stack_base + POPMARK
 #define dORIGMARK      I32 origmark = mark - stack_base
 #define SETORIGMARK    origmark = mark - stack_base
@@ -107,13 +112,32 @@
 #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
-#define dPOPPOPiirl    IV right = POPi; IV left = POPi
-
-#define dPOPTOPssrl    SV *right = POPs; SV *left = TOPs
-#define dPOPTOPnnrl    double right = POPn; double left = TOPn
-#define dPOPTOPiirl    IV right = POPi; IV left = TOPi
+#define dPOPXssrl(X)   SV *right = POPs; SV *left = CAT2(X,s)
+#define dPOPXnnrl(X)   double right = POPn; double left = CAT2(X,n)
+#define dPOPXiirl(X)   IV right = POPi; IV left = CAT2(X,i)
+
+#define USE_LEFT(sv) \
+       (SvOK(sv) || SvGMAGICAL(sv) || !(op->op_flags & OPf_STACKED))
+#define dPOPXnnrl_ul(X)        \
+    double right = POPn;                               \
+    SV *leftsv = CAT2(X,s);                            \
+    double left = USE_LEFT(leftsv) ? SvNV(leftsv) : 0.0
+#define dPOPXiirl_ul(X) \
+    IV right = POPi;                                   \
+    SV *leftsv = CAT2(X,s);                            \
+    IV left = USE_LEFT(leftsv) ? SvIV(leftsv) : 0
+
+#define dPOPPOPssrl    dPOPXssrl(POP)
+#define dPOPPOPnnrl    dPOPXnnrl(POP)
+#define dPOPPOPnnrl_ul dPOPXnnrl_ul(POP)
+#define dPOPPOPiirl    dPOPXiirl(POP)
+#define dPOPPOPiirl_ul dPOPXiirl_ul(POP)
+
+#define dPOPTOPssrl    dPOPXssrl(TOP)
+#define dPOPTOPnnrl    dPOPXnnrl(TOP)
+#define dPOPTOPnnrl_ul dPOPXnnrl_ul(TOP)
+#define dPOPTOPiirl    dPOPXiirl(TOP)
+#define dPOPTOPiirl_ul dPOPXiirl_ul(TOP)
 
 #define RETPUSHYES     RETURNX(PUSHs(&sv_yes))
 #define RETPUSHNO      RETURNX(PUSHs(&sv_no))
@@ -126,10 +150,10 @@
 #define ARGTARG                op->op_targ
 #define MAXARG         op->op_private
 
-#define SWITCHSTACK(f,t)       AvFILL(f) = sp - stack_base;            \
+#define SWITCHSTACK(f,t)       AvFILLp(f) = sp - stack_base;           \
                                stack_base = AvARRAY(t);                \
                                stack_max = stack_base + AvMAX(t);      \
-                               sp = stack_sp = stack_base + AvFILL(t); \
+                               sp = stack_sp = stack_base + AvFILLp(t);        \
                                curstack = t;
 
 #define EXTEND_MORTAL(n) \