[win32] fix C<print "foo ${\()}"> (pp_refgen fumbles when G_SCALAR, no args)

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

diff --git a/op.h b/op.h
index 961ebcf..a203c44 100644 (file)
--- a/op.h
+++ b/op.h
@@ -24,6 +24,7 @@
  */
 
 typedef U32 PADOFFSET;
+#define NOT_IN_PAD ((PADOFFSET) -1)
 
 #ifdef DEBUGGING_OPS
 #define OPCODE opcode
@@ -34,7 +35,7 @@ typedef U32 PADOFFSET;
 #define BASEOP                         \
     OP*                op_next;                \
     OP*                op_sibling;             \
-    OP*                (*op_ppaddr)();         \
+    OP*                (*op_ppaddr)_((ARGSproto));             \
     PADOFFSET  op_targ;                \
     OPCODE     op_type;                \
     U16                op_seq;                 \
@@ -73,6 +74,7 @@ typedef U32 PADOFFSET;
                                /*  On UNOPs, saw bare parens, e.g. eof(). */
                                /*  On OP_ENTERSUB || OP_NULL, saw a "do". */
                                /*  On OP_(ENTER|LEAVE)EVAL, don't clear $@ */
+                               /*  On OP_ENTERITER, loop var is per-thread */
 
 /* old names; don't use in new code, but don't break them, either */
 #define OPf_LIST       1
@@ -89,7 +91,11 @@ typedef U32 PADOFFSET;
 /* Private for OP_SASSIGN */
 #define OPpASSIGN_BACKWARDS    64      /* Left & right switched. */
 
+/* Private for OP_MATCH and OP_SUBST{,CONST} */
+#define OPpRUNTIME             64      /* Pattern coming in on the stack */
+
 /* Private for OP_TRANS */
+#define OPpTRANS_COUNTONLY     8
 #define OPpTRANS_SQUASH                16
 #define OPpTRANS_DELETE                32
 #define OPpTRANS_COMPLEMENT    64
@@ -126,6 +132,9 @@ typedef U32 PADOFFSET;
 /* Private for OP_SORT, OP_PRTF, OP_SPRINTF, string cmp'n, and case changers */
 #define OPpLOCALE              64      /* Use locale */
 
+/* Private for OP_THREADSV */
+#define OPpDONE_SVREF          64      /* Been through newSVREF once */
+
 struct op {
     BASEOP
 };
@@ -170,22 +179,20 @@ struct pmop {
     OP *       op_pmreplstart;
     PMOP *     op_pmnext;              /* list of all scanpats */
     REGEXP *   op_pmregexp;            /* compiled expression */
-    SV *       op_pmshort;             /* for a fast bypass of execute() */
     U16                op_pmflags;
     U16                op_pmpermflags;
-    char       op_pmslen;
 };
 
 #define PMf_USED       0x0001          /* pm has been used once already */
 #define PMf_ONCE       0x0002          /* use pattern only once per reset */
-#define PMf_SCANFIRST  0x0004          /* initial constant not anchored */
-#define PMf_ALL                0x0008          /* initial constant is whole pat */
+#define PMf_REVERSED   0x0004          /* Should be matched right->left */
+/*#define PMf_ALL              0x0008*/                /* initial constant is whole pat */
 #define PMf_SKIPWHITE  0x0010          /* skip leading whitespace for split */
 #define PMf_FOLD       0x0020          /* case insensitivity */
 #define PMf_CONST      0x0040          /* subst replacement is constant */
 #define PMf_KEEP       0x0080          /* keep 1st runtime pattern forever */
 #define PMf_GLOBAL     0x0100          /* pattern had a g modifier */
-#define PMf_RUNTIME    0x0200          /* pattern coming in on the stack */
+#define PMf_CONTINUE   0x0200          /* don't reset pos() if //g fails */
 #define PMf_EVAL       0x0400          /* evaluating replacement as expr */
 #define PMf_WHITE      0x0800          /* pattern is \s+ */
 #define PMf_MULTILINE  0x1000          /* assume multiple lines */
@@ -230,6 +237,19 @@ struct loop {
 #define cCOP ((COP*)op)
 #define cLOOP ((LOOP*)op)
 
+#define cUNOPo ((UNOP*)o)
+#define cBINOPo ((BINOP*)o)
+#define cLISTOPo ((LISTOP*)o)
+#define cLOGOPo ((LOGOP*)o)
+#define cCONDOPo ((CONDOP*)o)
+#define cPMOPo ((PMOP*)o)
+#define cSVOPo ((SVOP*)o)
+#define cGVOPo ((GVOP*)o)
+#define cPVOPo ((PVOP*)o)
+#define cCVOPo ((CVOP*)o)
+#define cCOPo ((COP*)o)
+#define cLOOPo ((LOOP*)o)
+
 #define kUNOP ((UNOP*)kid)
 #define kBINOP ((BINOP*)kid)
 #define kLISTOP ((LISTOP*)kid)
@@ -254,7 +274,26 @@ struct loop {
 #define OA_DANGEROUS 64
 #define OA_DEFGV 128
 
-#define OASHIFT 8
+/* The next 4 bits encode op class information */
+#define OA_CLASS_MASK (15 << 8)
+
+#define OA_BASEOP (0 << 8)
+#define OA_UNOP (1 << 8)
+#define OA_BINOP (2 << 8)
+#define OA_LOGOP (3 << 8)
+#define OA_CONDOP (4 << 8)
+#define OA_LISTOP (5 << 8)
+#define OA_PMOP (6 << 8)
+#define OA_SVOP (7 << 8)
+#define OA_GVOP (8 << 8)
+#define OA_PVOP (9 << 8)
+#define OA_LOOP (10 << 8)
+#define OA_COP (11 << 8)
+#define OA_BASEOP_OR_UNOP (12 << 8)
+#define OA_FILESTATOP (13 << 8)
+#define OA_LOOPEXOP (14 << 8)
+
+#define OASHIFT 12
 
 /* Remaining nybbles of opargs */
 #define OA_SCALAR 1