diff options
| -rw-r--r-- | op.h | 2 | ||||
| -rw-r--r-- | op_reg_common.h | 23 | ||||
| -rw-r--r-- | regexp.h | 2 | ||||
| -rw-r--r-- | regnodes.h | 14 |
4 files changed, 22 insertions, 19 deletions
@@ -319,7 +319,7 @@ struct pmop { * allocate off the low end until you get to PMf_BASE_SHIFT+0. If that isn't * enough, move PMf_BASE_SHIFT down (if possible) and add the new bit at the * other end instead; this preserves binary compatibility. */ -#define PMf_BASE_SHIFT (_RXf_PMf_SHIFT_NEXT+4) +#define PMf_BASE_SHIFT (_RXf_PMf_SHIFT_NEXT+3) /* 'use re "taint"' in scope: taint $1 etc. if target tainted */ #define PMf_RETAINT (1U<<(PMf_BASE_SHIFT+5)) diff --git a/op_reg_common.h b/op_reg_common.h index c3f3e7fefc..3edd4d8fa2 100644 --- a/op_reg_common.h +++ b/op_reg_common.h @@ -33,7 +33,9 @@ #define RXf_PMf_FOLD (1U << (RXf_PMf_STD_PMMOD_SHIFT+2)) /* /i */ #define RXf_PMf_EXTENDED (1U << (RXf_PMf_STD_PMMOD_SHIFT+3)) /* /x */ #define RXf_PMf_EXTENDED_MORE (1U << (RXf_PMf_STD_PMMOD_SHIFT+4)) /* /xx */ -#define RXf_PMf_KEEPCOPY (1U << (RXf_PMf_STD_PMMOD_SHIFT+5)) /* /p */ +#define RXf_PMf_NOCAPTURE (1U << (RXf_PMf_STD_PMMOD_SHIFT+5)) /* /n */ + +#define RXf_PMf_KEEPCOPY (1U << (RXf_PMf_STD_PMMOD_SHIFT+6)) /* /p */ /* 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 @@ -49,7 +51,7 @@ typedef enum { REGEX_ASCII_MORE_RESTRICTED_CHARSET } regex_charset; -#define _RXf_PMf_CHARSET_SHIFT ((RXf_PMf_STD_PMMOD_SHIFT)+6) +#define _RXf_PMf_CHARSET_SHIFT ((RXf_PMf_STD_PMMOD_SHIFT)+7) #define RXf_PMf_CHARSET (7U << (_RXf_PMf_CHARSET_SHIFT)) /* 3 bits */ /* Manually decorate these functions here with gcc-style attributes just to @@ -81,22 +83,22 @@ get_regex_charset(const U32 flags) return (regex_charset) ((flags & RXf_PMf_CHARSET) >> _RXf_PMf_CHARSET_SHIFT); } -#define _RXf_PMf_SHIFT_COMPILETIME (RXf_PMf_STD_PMMOD_SHIFT+9) +#define _RXf_PMf_SHIFT_COMPILETIME (RXf_PMf_STD_PMMOD_SHIFT+10) /* 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_PMf_SPLIT (1U<<(RXf_PMf_STD_PMMOD_SHIFT+9)) +#define RXf_PMf_SPLIT (1U<<(RXf_PMf_STD_PMMOD_SHIFT+10)) /* 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+10) +#define _RXf_PMf_SHIFT_NEXT (RXf_PMf_STD_PMMOD_SHIFT+11) /* Mask of the above bits. These need to be transferred from op_pmflags to * re->extflags during compilation */ -#define RXf_PMf_COMPILETIME (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_FOLD|RXf_PMf_EXTENDED|RXf_PMf_EXTENDED_MORE|RXf_PMf_KEEPCOPY|RXf_PMf_CHARSET) +#define RXf_PMf_COMPILETIME (RXf_PMf_MULTILINE|RXf_PMf_SINGLELINE|RXf_PMf_FOLD|RXf_PMf_EXTENDED|RXf_PMf_EXTENDED_MORE|RXf_PMf_KEEPCOPY|RXf_PMf_NOCAPTURE|RXf_PMf_CHARSET) #define RXf_PMf_FLAGCOPYMASK (RXf_PMf_COMPILETIME|RXf_PMf_SPLIT) #if 0 /* Temporary to get Jenkins happy again */ @@ -115,11 +117,12 @@ get_regex_charset(const U32 flags) #define PMf_FOLD (1U<<2) #define PMf_EXTENDED (1U<<3) #define PMf_EXTENDED_MORE (1U<<4) -#define PMf_KEEPCOPY (1U<<5) -#define PMf_CHARSET (7U<<6) -#define PMf_SPLIT (1U<<9) +#define PMf_NOCAPTURE (1U<<5) +#define PMf_KEEPCOPY (1U<<6) +#define PMf_CHARSET (7U<<7) +#define PMf_SPLIT (1U<<10) -#if PMf_MULTILINE != RXf_PMf_MULTILINE || PMf_SINGLELINE != RXf_PMf_SINGLELINE || PMf_FOLD != RXf_PMf_FOLD || PMf_EXTENDED != RXf_PMf_EXTENDED || PMf_EXTENDED_MORE != RXf_PMf_EXTENDED_MORE || PMf_KEEPCOPY != RXf_PMf_KEEPCOPY || PMf_SPLIT != RXf_PMf_SPLIT || PMf_CHARSET != RXf_PMf_CHARSET +#if PMf_MULTILINE != RXf_PMf_MULTILINE || PMf_SINGLELINE != RXf_PMf_SINGLELINE || PMf_FOLD != RXf_PMf_FOLD || PMf_EXTENDED != RXf_PMf_EXTENDED || PMf_EXTENDED_MORE != RXf_PMf_EXTENDED_MORE || PMf_KEEPCOPY != RXf_PMf_KEEPCOPY || PMf_SPLIT != RXf_PMf_SPLIT || PMf_CHARSET != RXf_PMf_CHARSET || PMf_NOCAPTURE != RXf_PMf_NOCAPTURE # error RXf_PMf defines are wrong #endif @@ -388,7 +388,7 @@ and check for NULL. * For the regexp bits, PL_reg_extflags_name[] in regnodes.h has a comment * giving which bits are used/unused */ -#define RXf_BASE_SHIFT (_RXf_PMf_SHIFT_NEXT + 4) +#define RXf_BASE_SHIFT (_RXf_PMf_SHIFT_NEXT + 3) /* What we have seen */ #define RXf_NO_INPLACE_SUBST (1U<<(RXf_BASE_SHIFT+2)) diff --git a/regnodes.h b/regnodes.h index 937dd57a6d..41662a05cc 100644 --- a/regnodes.h +++ b/regnodes.h @@ -627,18 +627,18 @@ EXTCONST char * const PL_reg_name[] = { EXTCONST char * PL_reg_extflags_name[]; #else EXTCONST char * const PL_reg_extflags_name[] = { - /* Bits in extflags defined: 11111111111111110000001111111111 */ + /* Bits in extflags defined: 11111111111111110000011111111111 */ "MULTILINE", /* 0x00000001 */ "SINGLELINE", /* 0x00000002 */ "FOLD", /* 0x00000004 */ "EXTENDED", /* 0x00000008 */ "EXTENDED_MORE", /* 0x00000010 */ - "KEEPCOPY", /* 0x00000020 */ - "CHARSET0", /* 0x00000040 : "CHARSET" - 0x000001c0 */ - "CHARSET1", /* 0x00000080 : "CHARSET" - 0x000001c0 */ - "CHARSET2", /* 0x00000100 : "CHARSET" - 0x000001c0 */ - "SPLIT", /* 0x00000200 */ - "UNUSED_BIT_10", /* 0x00000400 */ + "NOCAPTURE", /* 0x00000020 */ + "KEEPCOPY", /* 0x00000040 */ + "CHARSET0", /* 0x00000080 : "CHARSET" - 0x00000380 */ + "CHARSET1", /* 0x00000100 : "CHARSET" - 0x00000380 */ + "CHARSET2", /* 0x00000200 : "CHARSET" - 0x00000380 */ + "SPLIT", /* 0x00000400 */ "UNUSED_BIT_11", /* 0x00000800 */ "UNUSED_BIT_12", /* 0x00001000 */ "UNUSED_BIT_13", /* 0x00002000 */ |