Merge lp:~paul-lucas/zorba/bug-1131985 into lp:zorba

[Paul J. Lucas]

Fixed IsPrivateUse.

Fixed IsPrivateUse.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1131985-2013-04-18T03-32-51.688Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1131985-2013-04-18T03-32-51.688Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve.

[lp:~paul-lucas/zorba/bug-1131985]

11388. By Paul J. Lucas on 2013-04-18

Updated ChangeLog.

11389. By Paul J. Lucas on 2013-04-18

Merge from trunk.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1131985-2013-04-18T17-53-52.503Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1131985-2013-04-18T17-53-52.503Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-04-17 16:30:00 +0000
+++ ChangeLog	2013-04-18 04:23:27 +0000
@@ -76,6 +76,7 @@
   * Fixed bug #866874 (regex "range subtraction" not supported for ICU)
   * Fixed bug in computing the static type of an allowing-empty FOR variable.
   * Fixed bug #1099648 and #1088886 (XML parsing failures on Red Hat)
+  * Fixed bug #1131985 (\p{IsPrivateUse} in regex may not be working)
   * Fixed bug #1099535  (xml:parse endless loop)
   * Fixed bug in optimizing fn:count over general-index probes
   * Fixed bug #866958  (Parsing error not explicit enough)

=== 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 04:23:27 +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 InPrivateUse, 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 04:23:27 +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)