diff options
| author | Karl Williamson <public@khwilliamson.com> | 2012-12-27 12:34:41 -0700 |
|---|---|---|
| committer | Karl Williamson <public@khwilliamson.com> | 2012-12-28 10:38:55 -0700 |
| commit | b25a103638bc5111446c1e65a21db00a6e13acc1 (patch) | |
| tree | 496e9f487f356e04e3199d2f8d1938aa5f588dfc | |
| parent | f0c12ea8fdc0aca86872e322ec9009f1e933f9ed (diff) | |
| download | perl-b25a103638bc5111446c1e65a21db00a6e13acc1.tar.gz | |
regcomp.c: Clean up ANYOF_CLASS handling.
The ANYOF_CLASS flag is used in ANYOF nodes (for [bracketed] and the
synthetic start class) only when matching something like \w, [:punct:]
etc., under /l (locale). It should not be set unless /l is specified.
However, it was always getting set for the synthetic start class. This
commit fixes that. The previous code was masking errors in which it was
being tested for unnecessarily, and for much of the 5.17 series, the
synthetic start class was always set to test for locale, which was a
waste of cpu when no locale was specified.
| -rw-r--r-- | regcomp.c | 8 | ||||
| -rw-r--r-- | regcomp.h | 2 | ||||
| -rw-r--r-- | t/re/re_tests | 2 |
3 files changed, 7 insertions, 5 deletions
@@ -756,7 +756,7 @@ S_cl_anything(const RExC_state_t *pRExC_state, struct regnode_charclass_class *c PERL_ARGS_ASSERT_CL_ANYTHING; ANYOF_BITMAP_SETALL(cl); - cl->flags = ANYOF_CLASS|ANYOF_EOS|ANYOF_UNICODE_ALL + cl->flags = ANYOF_EOS|ANYOF_UNICODE_ALL |ANYOF_NON_UTF8_LATIN1_ALL; /* If any portion of the regex is to operate under locale rules, @@ -768,7 +768,7 @@ S_cl_anything(const RExC_state_t *pRExC_state, struct regnode_charclass_class *c * necessary. */ if (RExC_contains_locale) { ANYOF_CLASS_SETALL(cl); /* /l uses class */ - cl->flags |= ANYOF_LOCALE|ANYOF_LOC_FOLD; + cl->flags |= ANYOF_LOCALE|ANYOF_CLASS|ANYOF_LOC_FOLD; } else { ANYOF_CLASS_ZERO(cl); /* Only /l uses class now */ @@ -3549,7 +3549,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, * utf8 string, so accept a possible false positive for * latin1-range folds */ if (uc >= 0x100 || - (!(data->start_class->flags & (ANYOF_CLASS | ANYOF_LOCALE)) + (!(data->start_class->flags & ANYOF_LOCALE) && !ANYOF_BITMAP_TEST(data->start_class, uc) && (!(data->start_class->flags & ANYOF_LOC_FOLD) || !ANYOF_BITMAP_TEST(data->start_class, PL_fold_latin1[uc]))) @@ -3626,7 +3626,7 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, /* Check whether it is compatible with what we know already! */ int compat = 1; if (uc >= 0x100 || - (!(data->start_class->flags & (ANYOF_CLASS | ANYOF_LOCALE)) + (!(data->start_class->flags & ANYOF_LOCALE) && !ANYOF_BITMAP_TEST(data->start_class, uc) && !ANYOF_BITMAP_TEST(data->start_class, PL_fold_latin1[uc]))) { @@ -488,7 +488,7 @@ struct regnode_charclass_class { #define ANYOF_CLASS_SKIP ((ANYOF_CLASS_SIZE - 1)/sizeof(regnode)) #define ANYOF_CLASS_TEST_ANY_SET(p) \ - ((ANYOF_FLAGS(p) & (ANYOF_CLASS|ANYOF_IS_SYNTHETIC)) \ + ((ANYOF_FLAGS(p) & ANYOF_CLASS) \ && (((struct regnode_charclass_class*)(p))->classflags)) /*#define ANYOF_CLASS_ADD_SKIP (ANYOF_CLASS_SKIP - ANYOF_SKIP) * */ diff --git a/t/re/re_tests b/t/re/re_tests index 97b1e9f1ab..9da8491608 100644 --- a/t/re/re_tests +++ b/t/re/re_tests @@ -1719,4 +1719,6 @@ ab[c\\\](??{"x"})]{3}d ab\\](d y - - # [ perl #114272] \Vn \xFFn/ y $& \xFFn +/(?l:a?\w)/ b y $& b + # vim: softtabstop=0 noexpandtab |