[PATCH 5.004_65] Config_65-02-03.diff: SunOS and Solaris hints

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

diff --git a/op.h b/op.h
index 7e853c5..8476acd 100644 (file)
--- a/op.h
+++ b/op.h
@@ -74,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
@@ -94,6 +95,7 @@ typedef U32 PADOFFSET;
 #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
@@ -130,8 +132,8 @@ 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_SPECIFIC */
-#define OPpPM_NOT_CONST                64      /* Not constant enough for pmruntime */
+/* Private for OP_THREADSV */
+#define OPpDONE_SVREF          64      /* Been through newSVREF once */
 
 struct op {
     BASEOP
@@ -177,16 +179,17 @@ 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;
+    U8         op_pmdynflags;
 };
 
-#define PMf_USED       0x0001          /* pm has been used once already */
+#define PMdf_USED      0x01            /* pm has been used once already */
+
+#define PMf_TAINTMEM   0x0001          /* taint $1 etc. if target tainted */
 #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 */
@@ -275,6 +278,8 @@ struct loop {
 #define OA_DEFGV 128
 
 /* 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)