zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-1131985 into lp:zorba.

Commit message:
Fixed PrivateUse.

Requested reviews:
  Paul J. Lucas (paul-lucas)
Related bugs:
  Bug #1131985 in Zorba: "\p{IsPrivateUse} in regex may not be working"
  https://bugs.launchpad.net/zorba/+bug/1131985

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1131985/+merge/159542

Fixed PrivateUse.
-- 
https://code.launchpad.net/~paul-lucas/zorba/bug-1131985/+merge/159542
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/util/icu_regex.cpp'
--- src/util/icu_regex.cpp	2013-04-17 16:30:35 +0000
+++ src/util/icu_regex.cpp	2013-04-18 03:25:30 +0000
@@ -577,6 +577,15 @@
     //
     ascii::replace_all( *icu_re, "\\p{Is", 5, "\\p{In", 5 );
     ascii::replace_all( *icu_re, "\\P{Is", 5, "\\P{In", 5 );
+
+    //
+    // Apparently, ICU doesn't recognize PrivateUse, so change it to Co.
+    //
+    // Note that the "16" and "6" below are correct since "\\" represents a
+    // single '\'.
+    //
+    ascii::replace_all( *icu_re, "\\p{InPrivateUse}", 16, "\\p{Co}", 6 );
+    ascii::replace_all( *icu_re, "\\P{InPrivateUse}", 16, "\\P{Co}", 6 );
   } // q_flag
 
 #ifdef DEBUG_CONVERT_REGEX

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-17 22:01:55 +0000
+++ test/fots/CMakeLists.txt	2013-04-18 03:25:30 +0000
@@ -189,9 +189,6 @@
 EXPECTED_FOTS_FAILURE (fn-generate-id generate-id-017 0)
 EXPECTED_FOTS_FAILURE (fn-last last-24 0)
 EXPECTED_FOTS_FAILURE (fn-matches cbcl-matches-038 1131304)
-EXPECTED_FOTS_FAILURE (fn-matches.re re00288 1131985)
-EXPECTED_FOTS_FAILURE (fn-matches.re re00370 1131985)
-EXPECTED_FOTS_FAILURE (fn-matches.re re00480 1131985)
 EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-33 0)
 EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-35 0)
 EXPECTED_FOTS_FAILURE (fn-nilled fn-nilled-37 0)