added patch, tweaked PERL_OBJECT things

[perl5.git] / op.h

diff --git a/op.h b/op.h
index 0cc6be7..7a5d7a5 100644 (file)
--- a/op.h
+++ b/op.h
@@ -32,6 +32,9 @@ typedef U32 PADOFFSET;
 #define OPCODE U16
 #endif
 
+#ifdef BASEOP_DEFINITION
+#define BASEOP BASEOP_DEFINITION
+#else
 #define BASEOP                         \
     OP*                op_next;                \
     OP*                op_sibling;             \
@@ -41,6 +44,7 @@ typedef U32 PADOFFSET;
     U16                op_seq;                 \
     U8         op_flags;               \
     U8         op_private;
+#endif
 
 #define OP_GIMME(op,dfl) \
        (((op)->op_flags & OPf_WANT) == OPf_WANT_VOID   ? G_VOID   : \
@@ -185,24 +189,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_ALL              0x0008*/                /* initial constant is whole pat */
+#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;