neeraj 2003/07/15 05:58:57
Modified: java/src/org/apache/xerces/impl/xpath/regex Tag:
jaxp_1_2_3_branch RegularExpression.java
Log:
Applying unicode escape error fix so that it compiles with JDK 1.4.2.
Revision Changes Path
No revision
No revision
1.5.4.1 +12 -12
xml-xerces/java/src/org/apache/xerces/impl/xpath/regex/RegularExpression.java
Index: RegularExpression.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xpath/regex/RegularExpression.java,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- RegularExpression.java 9 Aug 2002 15:18:17 -0000 1.5
+++ RegularExpression.java 15 Jul 2003 12:58:57 -0000 1.5.4.1
@@ -135,7 +135,7 @@
* <li>Supports subtraction, union, and intersection operations for character
classes.
* <li>Not supported: <kbd>\</kbd><var>ooo</var> (Octal character
representations),
* <Kbd>\G</kbd>, <kbd>\C</kbd>, <kbd>\l</kbd><var>c</var>,
- * <kbd>\u005cu</kbd><var>c</var>, <kbd>\L</kbd>, <kbd>\U</kbd>,
+ * <kbd>\u005c u</kbd><var>c</var>, <kbd>\L</kbd>, <kbd>\U</kbd>,
* <kbd>\E</kbd>, <kbd>\Q</kbd>, <kbd>\N{</kbd><var>name</var><kbd>}</kbd>,
* <Kbd>(?{<kbd><var>code</var><kbd>})</kbd>,
<Kbd>(??{<kbd><var>code</var><kbd>})</kbd>
* </ul>
@@ -180,7 +180,7 @@
* variable length digits for
<kbd>\u005cx{</kbd><var>HHHH</var><kbd>}</kbd>.
*
* <!--
- * <dt class="REGEX"><kbd>\u005cu</kbd><var>HHHH</var>
+ * <dt class="REGEX"><kbd>\u005c u</kbd><var>HHHH</var>
* <dd>Matches a character of which code point is <var>HHHH</var>
(Hexadecimal) in Unicode.
* -->
*
@@ -204,7 +204,7 @@
* <dd>Positive character class. It matches a character in ranges.
* <dd><var>R<sub>n</sub></var>:
* <ul>
- * <li class="REGEX">A character (including <Kbd>\e \f \n \r \t</kbd>
<kbd>\u005cx</kbd><var>HH</var> <kbd>\u005cx{</kbd><var>HHHH</var><kbd>}</kbd>
<!--kbd>\u005cu</kbd><var>HHHH</var--> <kbd>\u005cv</kbd><var>HHHHHH</var>)
+ * <li class="REGEX">A character (including <Kbd>\e \f \n \r \t</kbd>
<kbd>\u005cx</kbd><var>HH</var> <kbd>\u005cx{</kbd><var>HHHH</var><kbd>}</kbd>
<!--kbd>\u005c u</kbd><var>HHHH</var--> <kbd>\u005cv</kbd><var>HHHHHH</var>)
* <p>This range matches the character.
* <li
class="REGEX"><var>C<sub>1</sub></var><kbd>-</kbd><var>C<sub>2</sub></var>
* <p>This range matches a character which has a code point that is >=
<var>C<sub>1</sub></var>'s code point and <= <var>C<sub>2</sub></var>'s code point.
@@ -497,7 +497,7 @@
* range-char ::= '\[' | '\]' | '\\' | '\' [,-efnrtv] | code-point | character-2
* code-point ::= '\x' hex-char hex-char
* | '\x{' hex-char+ '}'
- * <!-- | '\u005cu' hex-char hex-char hex-char hex-char
+ * <!-- | '\u005c u' hex-char hex-char hex-char hex-char
* --> | '\v' hex-char hex-char hex-char hex-char hex-char hex-char
* hex-char ::= [0-9a-fA-F]
* character-2 ::= (any character except \[]-,)
@@ -758,7 +758,7 @@
}
con.match = match;
- if (this.isSet(this.options, XMLSCHEMA_MODE)) {
+ if (RegularExpression.isSet(this.options, XMLSCHEMA_MODE)) {
int matchEnd = this. matchCharArray (con, this.operations, con.start,
1, this.options);
//System.err.println("DEBUG: matchEnd="+matchEnd);
if (matchEnd == con.limit) {
@@ -841,7 +841,7 @@
else if (this.firstChar != null) {
//System.err.println("DEBUG: with firstchar-matching: "+this.firstChar);
RangeToken range = this.firstChar;
- if (this.isSet(this.options, IGNORE_CASE)) {
+ if (RegularExpression.isSet(this.options, IGNORE_CASE)) {
range = this.firstChar.getCaseInsensitiveToken();
for (matchStart = con.start; matchStart <= limit; matchStart ++) {
int ch = target [ matchStart ] ;
@@ -1467,7 +1467,7 @@
}
con.match = match;
- if (this.isSet(this.options, XMLSCHEMA_MODE)) {
+ if (RegularExpression.isSet(this.options, XMLSCHEMA_MODE)) {
if (DEBUG) {
System.err.println("target string="+target);
}
@@ -1556,7 +1556,7 @@
else if (this.firstChar != null) {
//System.err.println("DEBUG: with firstchar-matching: "+this.firstChar);
RangeToken range = this.firstChar;
- if (this.isSet(this.options, IGNORE_CASE)) {
+ if (RegularExpression.isSet(this.options, IGNORE_CASE)) {
range = this.firstChar.getCaseInsensitiveToken();
for (matchStart = con.start; matchStart <= limit; matchStart ++) {
int ch = target .charAt( matchStart ) ;
@@ -2120,7 +2120,7 @@
}
con.match = match;
- if (this.isSet(this.options, XMLSCHEMA_MODE)) {
+ if (RegularExpression.isSet(this.options, XMLSCHEMA_MODE)) {
int matchEnd = this. matchCharacterIterator (con, this.operations,
con.start, 1, this.options);
//System.err.println("DEBUG: matchEnd="+matchEnd);
if (matchEnd == con.limit) {
@@ -2203,7 +2203,7 @@
else if (this.firstChar != null) {
//System.err.println("DEBUG: with firstchar-matching: "+this.firstChar);
RangeToken range = this.firstChar;
- if (this.isSet(this.options, IGNORE_CASE)) {
+ if (RegularExpression.isSet(this.options, IGNORE_CASE)) {
range = this.firstChar.getCaseInsensitiveToken();
for (matchStart = con.start; matchStart <= limit; matchStart ++) {
int ch = target .setIndex( matchStart ) ;
@@ -3035,7 +3035,7 @@
private void setPattern(String newPattern, int options) throws ParseException {
this.regex = newPattern;
this.options = options;
- RegexParser rp = this.isSet(this.options, RegularExpression.XMLSCHEMA_MODE)
+ RegexParser rp = RegularExpression.isSet(this.options,
RegularExpression.XMLSCHEMA_MODE)
? new ParserForXMLSchema() : new RegexParser();
this.tokentree = rp.parse(this.regex, this.options);
this.nofparen = rp.parennumber;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
