summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYves Orton <demerphq@gmail.com>2009-10-19 22:49:53 +0200
committerYves Orton <demerphq@gmail.com>2009-10-19 22:56:47 +0200
commit2e84be61fa7eefd83460cbe9147cdd734e6da947 (patch)
tree64c011d8c871aae27f16d4b0db04cb8ffeda97fb
parentd1eb31775715b0fcd7f36308da961c0698205d9f (diff)
downloadperl-2e84be61fa7eefd83460cbe9147cdd734e6da947.tar.gz
revert to 5.8.x semantics for \s \w and \d
revert ba9ac1759cb6e7a5e6883c85edd0b450061b5ccb Changing the semantics of \w \s and \d breaks too much and Jesse wants to do a rollout. This disables the new semantics until we can get all the details worked out.
-rw-r--r--regcomp.h2
-rw-r--r--t/re/pat_advanced.t2
-rw-r--r--t/re/re_tests2
-rw-r--r--t/re/reg_posixcc.t2
4 files changed, 4 insertions, 4 deletions
diff --git a/regcomp.h b/regcomp.h
index a1aba15810..20b4401ed2 100644
--- a/regcomp.h
+++ b/regcomp.h
@@ -35,7 +35,7 @@ typedef OP OP_4tree; /* Will be redefined later. */
*
* -demerphq
*/
-#define PERL_LEGACY_UNICODE_CHARCLASS_MAPPINGS 0
+#define PERL_LEGACY_UNICODE_CHARCLASS_MAPPINGS 1
/* Should the optimiser take positive assertions into account? */
#define PERL_ENABLE_POSITIVE_ASSERTION_STUDY 0
diff --git a/t/re/pat_advanced.t b/t/re/pat_advanced.t
index 73098e9c71..9775421cd4 100644
--- a/t/re/pat_advanced.t
+++ b/t/re/pat_advanced.t
@@ -768,7 +768,7 @@ sub run_tests {
local $Message = "No SEGV in s/// and UTF-8";
my $s = "s#\x{100}" x 4;
ok $s =~ s/[^\w]/ /g;
- if ( $ENV{PERL_TEST_LEGACY_POSIX_CC} ) {
+ if ( 1 or $ENV{PERL_TEST_LEGACY_POSIX_CC} ) {
iseq $s, "s \x{100}" x 4;
}
else {
diff --git a/t/re/re_tests b/t/re/re_tests
index b9177e92ca..725a75255e 100644
--- a/t/re/re_tests
+++ b/t/re/re_tests
@@ -1387,7 +1387,7 @@ foo(\h)bar foo\tbar y $1 \t
# [perl #60344] Regex lookbehind failure after an (if)then|else in perl 5.10
/\A(?(?=db2)db2|\D+)(?<!processed)\.csv\z/xms sql_processed.csv n - -
/\N{U+0100}/ \x{100} y $& \x{100} # Bug #59328
-[\s][\S] \x{a0}\x{a0} n - - # Unicode complements should not match same character
+[\s][\S] \x{a0}\x{a0} nT - - # Unicode complements should not match same character
# was generating malformed utf8
'[\x{100}\xff]'i \x{ff} y $& \x{ff}
diff --git a/t/re/reg_posixcc.t b/t/re/reg_posixcc.t
index 8b25d7de52..cd3890c8c2 100644
--- a/t/re/reg_posixcc.t
+++ b/t/re/reg_posixcc.t
@@ -41,7 +41,7 @@ my @pats=(
"[:^space:]",
"[:blank:]",
"[:^blank:]" );
-if ($ENV{PERL_TEST_LEGACY_POSIX_CC}) {
+if (1 or $ENV{PERL_TEST_LEGACY_POSIX_CC}) {
$::TODO = "Only works under PERL_LEGACY_UNICODE_CHARCLASS_MAPPINGS = 0";
}