From: Karl Williamson Date: Sat, 19 Feb 2011 17:11:58 +0000 (-0700) Subject: regcomp.c: no sharp ss tricky fold under locale X-Git-Tag: accepted/trunk/20130322.191538~5443 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e074b0e508bc39eeecd7253e65329aeb4df5c5ee;p=platform%2Fupstream%2Fperl.git regcomp.c: no sharp ss tricky fold under locale --- diff --git a/regcomp.c b/regcomp.c index d3e4bcd..61d8f82 100644 --- a/regcomp.c +++ b/regcomp.c @@ -7727,11 +7727,13 @@ S_reg_namedseq(pTHX_ RExC_state_t *pRExC_state, UV *valuep, I32 *flagp) vFAIL("Invalid hexadecimal number in \\N{U+...}"); } + /* XXX ? Change to ANYOF node if (FOLD - && (cp > 255 || ! MORE_ASCII_RESTRICTED) + && (cp > 255 || (! MORE_ASCII_RESTRICTED && ! LOC)) && is_TRICKYFOLD_cp(cp)) { } + */ /* Under /aa, we can't mix ASCII with non- in a fold. If we are * folding, and the source isn't ASCII, look through all the @@ -8684,7 +8686,7 @@ tryagain: * putting it in a special node keeps regexec from having to * deal with a non-utf8 multi-char fold */ if (FOLD - && (ender > 255 || ! MORE_ASCII_RESTRICTED) + && (ender > 255 || (! MORE_ASCII_RESTRICTED && ! LOC)) && is_TRICKYFOLD_cp(ender)) { /* If is in middle of outputting characters into an