undo goofed change 1157 (backed out the fix instead of keeping it)

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

diff --git a/pp.h b/pp.h
index a3b9ac9..de405f6 100644 (file)
--- a/pp.h
+++ b/pp.h
@@ -1,16 +1,24 @@
 /*    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 */
+#ifdef PERL_OBJECT
+#define PP(s) OP * CPerlObj::s(ARGSproto)
+#else
+#define PP(s) OP * s(ARGSproto)
+#endif
 
 #define SP sp
 #define MARK mark
@@ -23,7 +31,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
@@ -55,14 +64,14 @@
 #define POPp           (SvPVx(POPs, na))
 #define POPn           (SvNVx(POPs))
 #define POPi           ((IV)SvIVx(POPs))
-#define POPu           ((UV)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)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. */
@@ -107,15 +116,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 dPOPPOPuurl    UV right = POPu; UV left = POPu
-
-#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 dPOPTOPuurl    UV right = POPu; UV left = TOPu
+#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))
@@ -128,11 +154,14 @@
 #define ARGTARG                op->op_targ
 #define MAXARG         op->op_private
 
-#define SWITCHSTACK(f,t)       AvFILL(f) = sp - stack_base;            \
-                               stack_base = AvARRAY(t);                \
-                               stack_max = stack_base + AvMAX(t);      \
-                               sp = stack_sp = stack_base + AvFILL(t); \
-                               curstack = t;
+#define SWITCHSTACK(f,t) \
+    STMT_START {                                                       \
+       AvFILLp(f) = sp - stack_base;                                   \
+       stack_base = AvARRAY(t);                                        \
+       stack_max = stack_base + AvMAX(t);                              \
+       sp = stack_sp = stack_base + AvFILLp(t);                        \
+       curstack = t;                                                   \
+    } STMT_END
 
 #define EXTEND_MORTAL(n) \
        STMT_START { \
@@ -191,10 +220,11 @@
 /* newSVsv does not behave as advertised, so we copy missing
  * information by hand */
 
-
-#define RvDEEPCP(rv) STMT_START { SV* ref=SvRV(rv);      \
-  if (SvREFCNT(ref)>1) {                 \
-    SvREFCNT_dec(ref);                   \
+/* SV* ref causes confusion with the member variable
+   changed SV* ref to SV* tmpRef */
+#define RvDEEPCP(rv) STMT_START { SV* tmpRef=SvRV(rv);      \
+  if (SvREFCNT(tmpRef)>1) {                 \
+    SvREFCNT_dec(tmpRef);                   \
     SvRV(rv)=AMG_CALLun(rv,copy);        \
   } } STMT_END
 #else