X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/a62b1201c068dc7b099bcb7182e188c4d2fbf34c..01aa1a42bf87c8e8e3a08e8aae9bc6051c384470:/op_reg_common.h?ds=sidebyside

diff --git a/op_reg_common.h b/op_reg_common.h
index c6d846d..4c3fe2c 100644
--- a/op_reg_common.h
+++ b/op_reg_common.h
@@ -18,7 +18,7 @@
 /* This tells where the first of these bits is.  Setting it to 0 saved cycles
  * and memory.  I (khw) think the code will work if changed back, but haven't
  * tested it */
-/* Make sure to update lib/re.pm when changing this! */
+/* Make sure to update ext/re/re.pm when changing this! */
 #ifndef RXf_PMf_STD_PMMOD_SHIFT /* Only expand #include of this file once */
 
 #define RXf_PMf_STD_PMMOD_SHIFT 0
@@ -36,14 +36,17 @@
 /* The character set for the regex is stored in a field of more than one bit
  * using an enum, for reasons of compactness and to ensure that the options are
  * mutually exclusive */
+/* Make sure to update ext/re/re.pm when changing this! */
 typedef enum {
     REGEX_DEPENDS_CHARSET = 0,
     REGEX_LOCALE_CHARSET,
-    REGEX_UNICODE_CHARSET
+    REGEX_UNICODE_CHARSET,
+    REGEX_ASCII_RESTRICTED_CHARSET,
+    REGEX_ASCII_MORE_RESTRICTED_CHARSET
 } regex_charset;
 
 #define _RXf_PMf_CHARSET_SHIFT ((RXf_PMf_STD_PMMOD_SHIFT)+5)
-#define RXf_PMf_CHARSET (3 << (_RXf_PMf_CHARSET_SHIFT)) /* 2 bits */
+#define RXf_PMf_CHARSET (7 << (_RXf_PMf_CHARSET_SHIFT)) /* 3 bits */
 
 /* embed.pl doesn't yet know how to handle static inline functions, so
    manually decorate them here with gcc-style attributes.
@@ -71,12 +74,12 @@ get_regex_charset(const U32 flags)
 {
     /* Returns the enum corresponding to the character set in 'flags' */
 
-    return (flags & RXf_PMf_CHARSET) >> _RXf_PMf_CHARSET_SHIFT;
+    return (regex_charset) ((flags & RXf_PMf_CHARSET) >> _RXf_PMf_CHARSET_SHIFT);
 }
 
 /* Next available bit after the above.  Name begins with '_' so won't be
  * exported by B */
-#define _RXf_PMf_SHIFT_NEXT (RXf_PMf_STD_PMMOD_SHIFT+7)
+#define _RXf_PMf_SHIFT_NEXT (RXf_PMf_STD_PMMOD_SHIFT+8)
 
 /* Mask of the above bits.  These need to be transferred from op_pmflags to
  * re->extflags during compilation */