Add PL_ to merged file

[perl5.git] / op.h

diff --git a/op.h b/op.h
index fee95f7..75e674e 100644 (file)
--- a/op.h
+++ b/op.h
@@ -52,7 +52,7 @@ typedef U32 PADOFFSET;
         ((op)->op_flags & OPf_WANT) == OPf_WANT_LIST   ? G_ARRAY   : \
         dfl)
 
-#define GIMME_V                OP_GIMME(op, block_gimme())
+#define GIMME_V                OP_GIMME(PL_op, block_gimme())
 
 /* Public flags */
 
@@ -81,10 +81,14 @@ typedef U32 PADOFFSET;
                                /*  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
-#define OPf_KNOW       2
+#define OPf_LIST       OPf_WANT_LIST
+#define OPf_KNOW       OPf_WANT
 #define GIMME \
-         (op->op_flags & OPf_KNOW ? op->op_flags & OPf_LIST : dowantarray())
+         (PL_op->op_flags & OPf_WANT                                   \
+          ? ((PL_op->op_flags & OPf_WANT) == OPf_WANT_LIST             \
+             ? G_ARRAY                                                 \
+             : G_SCALAR)                                               \
+          : dowantarray())
 
 /* Private for lvalues */
 #define OPpLVAL_INTRO  128     /* Lvalue must be localized */
@@ -189,24 +193,28 @@ struct pmop {
 };
 
 #define PMdf_USED      0x01            /* pm has been used once already */
+#define PMdf_TAINTED   0x02            /* pm compiled from tainted pattern */
 
-#define PMf_TAINTMEM   0x0001          /* taint $1 etc. if target tainted */
+#define PMf_RETAINT    0x0001          /* taint $1 etc. if target tainted */
 #define PMf_ONCE       0x0002          /* use pattern only once per reset */
 #define PMf_REVERSED   0x0004          /* Should be matched right->left */
 #define PMf_MAYBE_CONST        0x0008          /* replacement contains variables */
 #define PMf_SKIPWHITE  0x0010          /* skip leading whitespace for split */
-#define PMf_FOLD       0x0020          /* case insensitivity */
+#define PMf_WHITE      0x0020          /* pattern is \s+ */
 #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_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_LOCALE     0x0800          /* use locale for character types */
 #define PMf_MULTILINE  0x1000          /* assume multiple lines */
 #define PMf_SINGLELINE 0x2000          /* assume single line */
-#define PMf_LOCALE     0x4000          /* use locale for character types */
+#define PMf_FOLD       0x4000          /* case insensitivity */
 #define PMf_EXTENDED   0x8000          /* chuck embedded whitespace */
 
+/* mask of bits stored in regexp->reganch */
+#define PMf_COMPILETIME        (PMf_MULTILINE|PMf_SINGLELINE|PMf_LOCALE|PMf_FOLD|PMf_EXTENDED)
+
 struct svop {
     BASEOP
     SV *       op_sv;
@@ -232,17 +240,17 @@ struct loop {
     OP *       op_lastop;
 };
 
-#define cUNOP ((UNOP*)op)
-#define cBINOP ((BINOP*)op)
-#define cLISTOP ((LISTOP*)op)
-#define cLOGOP ((LOGOP*)op)
-#define cCONDOP ((CONDOP*)op)
-#define cPMOP ((PMOP*)op)
-#define cSVOP ((SVOP*)op)
-#define cGVOP ((GVOP*)op)
-#define cPVOP ((PVOP*)op)
-#define cCOP ((COP*)op)
-#define cLOOP ((LOOP*)op)
+#define cUNOP ((UNOP*)PL_op)
+#define cBINOP ((BINOP*)PL_op)
+#define cLISTOP ((LISTOP*)PL_op)
+#define cLOGOP ((LOGOP*)PL_op)
+#define cCONDOP ((CONDOP*)PL_op)
+#define cPMOP ((PMOP*)PL_op)
+#define cSVOP ((SVOP*)PL_op)
+#define cGVOP ((GVOP*)PL_op)
+#define cPVOP ((PVOP*)PL_op)
+#define cCOP ((COP*)PL_op)
+#define cLOOP ((LOOP*)PL_op)
 
 #define cUNOPo ((UNOP*)o)
 #define cBINOPo ((BINOP*)o)