You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2006/10/30 05:16:16 UTC

svn commit: r469061 - /xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/RegexParser.java

Author: mrglavas
Date: Sun Oct 29 20:16:15 2006
New Revision: 469061

URL: http://svn.apache.org/viewvc?view=rev&rev=469061
Log:
Fixing JIRA Issue #1061:
http://issues.apache.org/jira/browse/XERCESJ-1061

"$" and "^" are not anchors in XML schema regular expressions.
Do not treat them as special in XML schema mode. Patch thanks
to Chris Carman.

Modified:
    xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/RegexParser.java

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/RegexParser.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/RegexParser.java?view=diff&rev=469061&r1=469060&r2=469061
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/RegexParser.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xpath/regex/RegexParser.java Sun Oct 29 20:16:15 2006
@@ -206,8 +206,22 @@
           case ')': ret = T_RPAREN;         break;
           case '.': ret = T_DOT;            break;
           case '[': ret = T_LBRACKET;       break;
-          case '^': ret = T_CARET;          break;
-          case '$': ret = T_DOLLAR;         break;
+          case '^':
+              if (this.isSet(RegularExpression.XMLSCHEMA_MODE)) {
+                  ret = T_CHAR;
+              }
+              else {
+                  ret = T_CARET;
+              }
+              break;
+          case '$': 
+              if (this.isSet(RegularExpression.XMLSCHEMA_MODE)) {
+                  ret = T_CHAR;
+              }
+              else {
+                  ret = T_DOLLAR;
+              }
+              break;
           case '(':
             ret = T_LPAREN;
             if (this.offset >= this.regexlen)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org