diff options
| author | Karl Williamson <khw@cpan.org> | 2015-01-04 21:29:10 -0700 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2015-01-13 12:01:02 -0700 |
| commit | d262c0c7f39a7648b418423cba7b24c6e638c4ee (patch) | |
| tree | 20ed71b4f2cbd47d7546f8d54b4401448ec72faf /op_reg_common.h | |
| parent | a4fbcc27c3bd768277fb2cfbb312f8ada31e3440 (diff) | |
| download | perl-d262c0c7f39a7648b418423cba7b24c6e638c4ee.tar.gz | |
Reserve a bit for 'the re strict subpragma.
This is another step in the process
Diffstat (limited to 'op_reg_common.h')
| -rw-r--r-- | op_reg_common.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/op_reg_common.h b/op_reg_common.h index 956a5b8a23..99f9f9d787 100644 --- a/op_reg_common.h +++ b/op_reg_common.h @@ -83,22 +83,25 @@ 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+10) +#define RXf_PMf_STRICT (1U<<(RXf_PMf_STD_PMMOD_SHIFT+10)) + +#define _RXf_PMf_SHIFT_COMPILETIME (RXf_PMf_STD_PMMOD_SHIFT+11) + /* 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+10)) +#define RXf_PMf_SPLIT (1U<<(RXf_PMf_STD_PMMOD_SHIFT+11)) /* 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+11) +#define _RXf_PMf_SHIFT_NEXT (RXf_PMf_STD_PMMOD_SHIFT+12) /* 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_NOCAPTURE|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|RXf_PMf_STRICT) #define RXf_PMf_FLAGCOPYMASK (RXf_PMf_COMPILETIME|RXf_PMf_SPLIT) #if 0 /* Temporary to get Jenkins happy again */ @@ -120,9 +123,10 @@ get_regex_charset(const U32 flags) #define PMf_NOCAPTURE (1U<<5) #define PMf_KEEPCOPY (1U<<6) #define PMf_CHARSET (7U<<7) -#define PMf_SPLIT (1U<<10) +#define PMf_STRICT (1U<<10) +#define PMf_SPLIT (1U<<11) -#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 +#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 || PMf_STRICT != RXf_PMf_STRICT # error RXf_PMf defines are wrong #endif |