diff options
| author | Karl Williamson <public@khwilliamson.com> | 2010-12-26 10:31:16 -0700 |
|---|---|---|
| committer | Karl Williamson <public@khwilliamson.com> | 2011-01-16 16:36:43 -0700 |
| commit | a62b1201c068dc7b099bcb7182e188c4d2fbf34c (patch) | |
| tree | 6c067a6e4adc8f2333b749fa3592c2812e711b95 /universal.c | |
| parent | 5458d9a05ef8545ccbb8a58e670fbede60d10480 (diff) | |
| download | perl-a62b1201c068dc7b099bcb7182e188c4d2fbf34c.tar.gz | |
Use multi-bit field for regex character set
The /d, /l, and /u regex modifiers are mutually exclusive. This patch
changes the field that stores the character set to use more than one bit
with an enum determining which one. This data structure more
closely follows the semantics of their being mutually exclusive, and
conserves bits as well, and is better expandable.
A small API is added to set and query the bit field.
This patch is not .xs source backwards compatible. A handful of cpan
programs are affected.
Diffstat (limited to 'universal.c')
| -rw-r--r-- | universal.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/universal.c b/universal.c index 08f9ab8f51..96a92cf994 100644 --- a/universal.c +++ b/universal.c @@ -1155,8 +1155,7 @@ XS(XS_re_regexp_pattern) if ( GIMME_V == G_ARRAY ) { STRLEN left = 0; - char reflags[sizeof(INT_PAT_MODS) + 1]; /* The +1 is for the charset - modifier */ + char reflags[sizeof(INT_PAT_MODS) + MAX_CHARSET_NAME_LENGTH]; const char *fptr; char ch; U16 match_flags; @@ -1164,14 +1163,15 @@ XS(XS_re_regexp_pattern) /* we are in list context so stringify the modifiers that apply. We ignore "negative - modifiers" in this scenario. + modifiers" in this scenario, and the default character set */ - if (RX_EXTFLAGS(re) & RXf_PMf_LOCALE) { - reflags[left++] = LOCALE_PAT_MOD; - } - else if (RX_EXTFLAGS(re) & RXf_PMf_UNICODE) { - reflags[left++] = UNICODE_PAT_MOD; + if (get_regex_charset(RX_EXTFLAGS(re)) != REGEX_DEPENDS_CHARSET) { + STRLEN len; + const char* const name = get_regex_charset_name(RX_EXTFLAGS(re), + &len); + Copy(name, reflags + left, len, char); + left += len; } fptr = INT_PAT_MODS; match_flags = (U16)((RX_EXTFLAGS(re) & PMf_COMPILETIME) |