diff options
| author | Karl Williamson <khw@cpan.org> | 2015-12-23 12:43:30 -0700 |
|---|---|---|
| committer | Karl Williamson <khw@cpan.org> | 2015-12-26 12:57:40 -0700 |
| commit | 037715a6d8890fc5a104494153096c071496030a (patch) | |
| tree | 9066391ff920aa407f04eab9fd1e98100b0d5681 /regexec.c | |
| parent | 7e327f7638ec744b796b0bcf2fa43cb94ed67d6c (diff) | |
| download | perl-037715a6d8890fc5a104494153096c071496030a.tar.gz | |
regcomp.h: Shorten, clarify names of internal flags
Some of the names are expanded slightly and not shortened
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1826,7 +1826,7 @@ S_find_byclass(pTHX_ regexp * prog, const regnode *c, char *s, case ANYOFL: _CHECK_AND_WARN_PROBLEMATIC_LOCALE; - if ((FLAGS(c) & ANYOF_LOC_REQ_UTF8) && ! IN_UTF8_CTYPE_LOCALE) { + if ((FLAGS(c) & ANYOFL_UTF8_LOCALE_REQD) && ! IN_UTF8_CTYPE_LOCALE) { Perl_ck_warner(aTHX_ packWARN(WARN_LOCALE), utf8_locale_required); } @@ -5766,7 +5766,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog) case ANYOFL: /* /[abc]/l */ _CHECK_AND_WARN_PROBLEMATIC_LOCALE; - if ((FLAGS(scan) & ANYOF_LOC_REQ_UTF8) && ! IN_UTF8_CTYPE_LOCALE) + if ((FLAGS(scan) & ANYOFL_UTF8_LOCALE_REQD) && ! IN_UTF8_CTYPE_LOCALE) { Perl_ck_warner(aTHX_ packWARN(WARN_LOCALE), utf8_locale_required); } @@ -8301,7 +8301,7 @@ S_regrepeat(pTHX_ regexp *prog, char **startposp, const regnode *p, case ANYOFL: _CHECK_AND_WARN_PROBLEMATIC_LOCALE; - if ((FLAGS(p) & ANYOF_LOC_REQ_UTF8) && ! IN_UTF8_CTYPE_LOCALE) { + if ((FLAGS(p) & ANYOFL_UTF8_LOCALE_REQD) && ! IN_UTF8_CTYPE_LOCALE) { Perl_ck_warner(aTHX_ packWARN(WARN_LOCALE), utf8_locale_required); } /* FALLTHROUGH */ @@ -8648,7 +8648,7 @@ S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8* const * UTF8_ALLOW_FFFF */ if (c_len == (STRLEN)-1) Perl_croak(aTHX_ "Malformed UTF-8 character (fatal)"); - if (c > 255 && OP(n) == ANYOFL && ! (flags & ANYOF_LOC_REQ_UTF8)) { + if (c > 255 && OP(n) == ANYOFL && ! (flags & ANYOFL_UTF8_LOCALE_REQD)) { _CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG(c); } } @@ -8666,7 +8666,7 @@ S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8* const match = TRUE; } else if (flags & ANYOF_LOCALE_FLAGS) { - if ((flags & ANYOF_LOC_FOLD) + if ((flags & ANYOFL_FOLD) && c < 256 && ANYOF_BITMAP_TEST(n, PL_fold_locale[c])) { @@ -8751,7 +8751,7 @@ S_reginclass(pTHX_ regexp * const prog, const regnode * const n, const U8* const && c < 256 # endif ))) - || (( flags & ANYOF_ONLY_UTF8_LOC_FOLD_MATCHES) + || (( flags & ANYOFL_SOME_FOLDS_ONLY_IN_UTF8_LOCALE) && IN_UTF8_CTYPE_LOCALE))) { SV* only_utf8_locale = NULL; |