From: Yves Orton <demerphq@gmail.com>
Date: Mon, 19 Oct 2009 20:49:53 +0000 (+0200)
Subject: revert to 5.8.x semantics for \s \w and \d
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2e84be61fa7eefd83460cbe9147cdd734e6da947;p=p5sagit%2Fp5-mst-13.2.git

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.
---

diff --git a/regcomp.h b/regcomp.h
index a1aba15..20b4401 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 73098e9..9775421 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 b9177e9..725a752 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 8b25d7d..cd3890c 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";
 }