zorba-coders team mailing list archive

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

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

Commit message:
Fixed use of *+? inside [].

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/158439

Fixed use of *+? inside [].
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/158439
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/util/regex.cpp'
--- src/util/regex.cpp	2013-02-28 11:15:32 +0000
+++ src/util/regex.cpp	2013-04-11 17:39:24 +0000
@@ -405,15 +405,17 @@
           if ( q_flag )
             *icu_re += '\\';
           else {
-            //
-            // ICU allows the multiple quantifiers *+, ++, and ?+, but XQuery
-            // does not so we have to check for them.
-            //
-            if ( got_quantifier && c != '?' )
-              throw INVALID_RE_EXCEPTION(
-                xq_re, ZED( BadQuantifierHere_3 ), c
-              );
-            got_quantifier = 2;
+            if ( !in_char_class ) {
+              //
+              // ICU allows the multiple quantifiers *+, ++, and ?+, but XQuery
+              // does not so we have to check for them.
+              //
+              if ( got_quantifier && c != '?' )
+                throw INVALID_RE_EXCEPTION(
+                  xq_re, ZED( BadQuantifierHere_3 ), c
+                );
+              got_quantifier = 2;
+            }
           }
           break;
         case '-':

=== modified file 'src/util/time_util.h'
--- src/util/time_util.h	2013-03-21 15:15:17 +0000
+++ src/util/time_util.h	2013-04-11 17:39:24 +0000
@@ -167,7 +167,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
- * Month (<code>mod</code>) values as used by the \c tm structure.
+ * Month (<code>mon</code>) values as used by the \c tm structure.
  */
 enum month {
   jan = 0,

=== added file 'test/rbkt/ExpQueryResults/zorba/string/Regex/regex_r13.xml.res'
--- test/rbkt/ExpQueryResults/zorba/string/Regex/regex_r13.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/string/Regex/regex_r13.xml.res	2013-04-11 17:39:24 +0000
@@ -0,0 +1,1 @@
+foo

=== added file 'test/rbkt/Queries/zorba/string/Regex/regex_r13.xq'
--- test/rbkt/Queries/zorba/string/Regex/regex_r13.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/string/Regex/regex_r13.xq	2013-04-11 17:39:24 +0000
@@ -0,0 +1,1 @@
+fn:replace( "foo*", "[*+?]$", "" )