op.h, regexp.h: renumber shifts.

[perl5.git] / regexp.h

diff --git a/regexp.h b/regexp.h
index 7b48a48..f041177 100644 (file)
--- a/regexp.h
+++ b/regexp.h
@@ -8,8 +8,6 @@
  *
  */
 
-#include "op_reg_common.h"
-
 /*
  * Definitions etc. for regexp(3) routines.
  *
@@ -220,25 +218,17 @@ and check for NULL.
 /* Flags stored in regexp->extflags
  * These are used by code external to the regexp engine
  *
- * Note that flags starting with RXf_PMf_ have exact equivalents
- * stored in op_pmflags and which are defined in op.h, they are defined
- * numerically here only for clarity.
+ * Note that the flags whose names start with RXf_PMf_ are defined in
+ * op_reg_common.h, being copied from the parallel flags of op_pmflags
  *
  * NOTE: if you modify any RXf flags you should run regen.pl or regcomp.pl
  * so that regnodes.h is updated with the changes.
  *
  */
 
-/* 0x3F of extflags is used by (RXf_)PMf_COMPILETIME
- * If you change these you need to change the equivalent flags in op.h, and
- * vice versa.  These need to be ordered so that the msix are contiguous
- * starting at bit 0, followed by the p; bit 0 is because of the shift below
- * being 0; see STD_PAT_MODS and INT_PAT_MODS below for the contiguity cause */
-/* the flags above are transfered from the PMOP->op_pmflags member during
- * compilation */
-#define RXf_PMf_STD_PMMOD_SHIFT        0
+#include "op_reg_common.h"
+
 #define RXf_PMf_STD_PMMOD      (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_FOLD|RXf_PMf_EXTENDED)
-#define RXf_PMf_COMPILETIME    (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_LOCALE|RXf_PMf_FOLD|RXf_PMf_EXTENDED|RXf_PMf_KEEPCOPY)
 
 #define CASE_STD_PMMOD_FLAGS_PARSE_SET(pmfl)                        \
     case IGNORE_PAT_MOD:    *(pmfl) |= RXf_PMf_FOLD;       break;   \
@@ -291,57 +281,57 @@ and check for NULL.
  *
  */
 
-#define RXf_BASE_SHIFT ((_RXf_PMf_SHIFT_NEXT)-1)
+#define RXf_BASE_SHIFT (_RXf_PMf_SHIFT_NEXT+2)
 
 /* Anchor and GPOS related stuff */
-#define RXf_ANCH_BOL           (1<<(RXf_BASE_SHIFT+3))
-#define RXf_ANCH_MBOL          (1<<(RXf_BASE_SHIFT+4))
-#define RXf_ANCH_SBOL          (1<<(RXf_BASE_SHIFT+5))
-#define RXf_ANCH_GPOS          (1<<(RXf_BASE_SHIFT+6))
-#define RXf_GPOS_SEEN          (1<<(RXf_BASE_SHIFT+7))
-#define RXf_GPOS_FLOAT         (1<<(RXf_BASE_SHIFT+8))
+#define RXf_ANCH_BOL           (1<<(RXf_BASE_SHIFT+0))
+#define RXf_ANCH_MBOL          (1<<(RXf_BASE_SHIFT+1))
+#define RXf_ANCH_SBOL          (1<<(RXf_BASE_SHIFT+2))
+#define RXf_ANCH_GPOS          (1<<(RXf_BASE_SHIFT+3))
+#define RXf_GPOS_SEEN          (1<<(RXf_BASE_SHIFT+4))
+#define RXf_GPOS_FLOAT         (1<<(RXf_BASE_SHIFT+5))
 /* two bits here */
 #define RXf_ANCH               (RXf_ANCH_BOL|RXf_ANCH_MBOL|RXf_ANCH_GPOS|RXf_ANCH_SBOL)
 #define RXf_GPOS_CHECK          (RXf_GPOS_SEEN|RXf_ANCH_GPOS)
 #define RXf_ANCH_SINGLE         (RXf_ANCH_SBOL|RXf_ANCH_GPOS)
 
 /* What we have seen */
-#define RXf_LOOKBEHIND_SEEN    (1<<(RXf_BASE_SHIFT+9))
-#define RXf_EVAL_SEEN          (1<<(RXf_BASE_SHIFT+10))
-#define RXf_CANY_SEEN          (1<<(RXf_BASE_SHIFT+11))
+#define RXf_LOOKBEHIND_SEEN    (1<<(RXf_BASE_SHIFT+6))
+#define RXf_EVAL_SEEN          (1<<(RXf_BASE_SHIFT+7))
+#define RXf_CANY_SEEN          (1<<(RXf_BASE_SHIFT+8))
 
 /* Special */
-#define RXf_NOSCAN             (1<<(RXf_BASE_SHIFT+12))
-#define RXf_CHECK_ALL          (1<<(RXf_BASE_SHIFT+13))
+#define RXf_NOSCAN             (1<<(RXf_BASE_SHIFT+9))
+#define RXf_CHECK_ALL          (1<<(RXf_BASE_SHIFT+10))
 
 /* UTF8 related */
-#define RXf_MATCH_UTF8         (1<<(RXf_BASE_SHIFT+15))
+#define RXf_MATCH_UTF8         (1<<(RXf_BASE_SHIFT+12))
 
 /* Intuit related */
-#define RXf_USE_INTUIT_NOML    (1<<(RXf_BASE_SHIFT+16))
-#define RXf_USE_INTUIT_ML      (1<<(RXf_BASE_SHIFT+17))
-#define RXf_INTUIT_TAIL        (1<<(RXf_BASE_SHIFT+18))
+#define RXf_USE_INTUIT_NOML    (1<<(RXf_BASE_SHIFT+13))
+#define RXf_USE_INTUIT_ML      (1<<(RXf_BASE_SHIFT+14))
+#define RXf_INTUIT_TAIL        (1<<(RXf_BASE_SHIFT+15))
 
 /*
   Set in Perl_pmruntime if op_flags & OPf_SPECIAL, i.e. split. Will
   be used by regex engines to check whether they should set
   RXf_SKIPWHITE
 */
-#define RXf_SPLIT              (1<<(RXf_BASE_SHIFT+19))
+#define RXf_SPLIT              (1<<(RXf_BASE_SHIFT+16))
 
 #define RXf_USE_INTUIT         (RXf_USE_INTUIT_NOML|RXf_USE_INTUIT_ML)
 
 /* Copy and tainted info */
-#define RXf_COPY_DONE          (1<<(RXf_BASE_SHIFT+20))
-#define RXf_TAINTED_SEEN       (1<<(RXf_BASE_SHIFT+21))
-#define RXf_TAINTED            (1<<(RXf_BASE_SHIFT+22)) /* this pattern is tainted */
+#define RXf_COPY_DONE          (1<<(RXf_BASE_SHIFT+17))
+#define RXf_TAINTED_SEEN       (1<<(RXf_BASE_SHIFT+18))
+#define RXf_TAINTED            (1<<(RXf_BASE_SHIFT+19)) /* this pattern is tainted */
 
 /* Flags indicating special patterns */
-#define RXf_START_ONLY         (1<<(RXf_BASE_SHIFT+23)) /* Pattern is /^/ */
-#define RXf_SKIPWHITE          (1<<(RXf_BASE_SHIFT+24)) /* Pattern is for a split / / */
-#define RXf_WHITE              (1<<(RXf_BASE_SHIFT+25)) /* Pattern is /\s+/ */
-#define RXf_NULL               (1<<(RXf_BASE_SHIFT+26)) /* Pattern is // */
-#if RXf_BASE_SHIFT+26 > 31
+#define RXf_START_ONLY         (1<<(RXf_BASE_SHIFT+20)) /* Pattern is /^/ */
+#define RXf_SKIPWHITE          (1<<(RXf_BASE_SHIFT+21)) /* Pattern is for a split / / */
+#define RXf_WHITE              (1<<(RXf_BASE_SHIFT+22)) /* Pattern is /\s+/ */
+#define RXf_NULL               (1<<(RXf_BASE_SHIFT+23)) /* Pattern is // */
+#if RXf_BASE_SHIFT+23 > 31
 #   error Too many RXf_PMf bits used.  See regnodes.h for any spare in middle
 #endif