diff options
| -rw-r--r-- | ext/re/re.pm | 1 | ||||
| -rw-r--r-- | perl.h | 1 | ||||
| -rw-r--r-- | regcomp.c | 38 | ||||
| -rwxr-xr-x | t/op/pat.t | 2 | ||||
| -rwxr-xr-x | t/op/regexp.t | 2 |
5 files changed, 7 insertions, 37 deletions
diff --git a/ext/re/re.pm b/ext/re/re.pm index d66bda5800..f1a4e3bc38 100644 --- a/ext/re/re.pm +++ b/ext/re/re.pm @@ -79,7 +79,6 @@ See L<perlmodlib/Pragmatic Modules>. my %bitmask = ( taint => 0x00100000, eval => 0x00200000, -asciirange => 0x02000000, ); sub setcolor { @@ -2840,7 +2840,6 @@ enum { /* pass one of these to get_vtbl */ #define HINT_FILETEST_ACCESS 0x00400000 #define HINT_UTF8 0x00800000 #define HINT_UTF8_DISTINCT 0x01000000 -#define HINT_RE_ASCIIR 0x02000000 /* Various states of an input record separator SV (rs, nrs) */ #define RsSNARF(sv) (! SvOK(sv)) @@ -3515,14 +3515,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state) ANYOF_BITMAP_SET(ret, value); #else /* EBCDIC */ for (value = 0; value < 256; value++) { - if (PL_hints & HINT_RE_ASCIIR) { - if (NATIVE_TO_ASCII(value) < 128) - ANYOF_BITMAP_SET(ret, value); - } - else { - if (isASCII(value)) - ANYOF_BITMAP_SET(ret, value); - } + if (isASCII(value)) + ANYOF_BITMAP_SET(ret, value); } #endif /* EBCDIC */ } @@ -3537,14 +3531,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state) ANYOF_BITMAP_SET(ret, value); #else /* EBCDIC */ for (value = 0; value < 256; value++) { - if (PL_hints & HINT_RE_ASCIIR) { - if (NATIVE_TO_ASCII(value) >= 128) - ANYOF_BITMAP_SET(ret, value); - } - else { - if (!isASCII(value)) - ANYOF_BITMAP_SET(ret, value); - } + if (!isASCII(value)) + ANYOF_BITMAP_SET(ret, value); } #endif /* EBCDIC */ } @@ -3783,9 +3771,7 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state) } /* end of namedclass \blah */ if (range) { - if (((prevvalue > value) && !(PL_hints & HINT_RE_ASCIIR)) || - ((NATIVE_TO_UNI(prevvalue) > NATIVE_TO_UNI(value)) && - (PL_hints & HINT_RE_ASCIIR))) /* b-a */ { + if (prevvalue > value) /* b-a */ { Simple_vFAIL4("Invalid [] range \"%*.*s\"", RExC_parse - rangebegin, RExC_parse - rangebegin, @@ -3823,18 +3809,8 @@ S_regclass(pTHX_ RExC_state_t *pRExC_state) IV ceilvalue = value < 256 ? value : 255; #ifdef EBCDIC - if (PL_hints & HINT_RE_ASCIIR) { - /* New style scheme for ranges: - * use re 'asciir'; - * do ranges in ASCII/Unicode space - */ - for (i = NATIVE_TO_ASCII(prevvalue); - i <= NATIVE_TO_ASCII(ceilvalue); - i++) - ANYOF_BITMAP_SET(ret, ASCII_TO_NATIVE(i)); - } - else if ((isLOWER(prevvalue) && isLOWER(ceilvalue)) || - (isUPPER(prevvalue) && isUPPER(ceilvalue))) + if ((isLOWER(prevvalue) && isLOWER(ceilvalue)) || + (isUPPER(prevvalue) && isUPPER(ceilvalue))) { if (isLOWER(prevvalue)) { for (i = prevvalue; i <= ceilvalue; i++) diff --git a/t/op/pat.t b/t/op/pat.t index 1be72346f8..0df4d786ee 100755 --- a/t/op/pat.t +++ b/t/op/pat.t @@ -13,8 +13,6 @@ BEGIN { @INC = '../lib'; } -use re 'asciirange'; # Compute ranges in ASCII space - eval 'use Config'; # Defaults assumed if this fails $x = "abc\ndef\n"; diff --git a/t/op/regexp.t b/t/op/regexp.t index 0b81e714a9..4a4d42fd98 100755 --- a/t/op/regexp.t +++ b/t/op/regexp.t @@ -36,8 +36,6 @@ BEGIN { @INC = '../lib'; } -use re 'asciirange'; # ranges are computed in ASCII - $iters = shift || 1; # Poor man performance suite, 10000 is OK. open(TESTS,'op/re_tests') || open(TESTS,'t/op/re_tests') || |