vgritsenko 2003/09/01 11:31:53
Modified: docs RETest.txt
src/java/org/apache/regexp RECompiler.java
xdocs RETest.txt changes.xml
Log:
Fix bug #22804: ArrayIndexOutOfBoundsException on negated classes.
Was happening in RERange.delete method
Revision Changes Path
1.11 +12 -0 jakarta-regexp/docs/RETest.txt
Index: RETest.txt
===================================================================
RCS file: /home/cvs/jakarta-regexp/docs/RETest.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RETest.txt 2 May 2003 02:28:13 -0000 1.10
+++ RETest.txt 1 Sep 2003 18:31:53 -0000 1.11
@@ -1291,3 +1291,15 @@
acghij
YES
acghij
+
+#214
+[^02468ACEGIKMOQSUW]
+012
+YES
+1
+
+#215
+[^02468ACEGIKMOQSUW]
+UVW
+YES
+V
1.11 +2 -2 jakarta-regexp/src/java/org/apache/regexp/RECompiler.java
Index: RECompiler.java
===================================================================
RCS file: /home/cvs/jakarta-regexp/src/java/org/apache/regexp/RECompiler.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RECompiler.java 2 May 2003 02:28:13 -0000 1.10
+++ RECompiler.java 1 Sep 2003 18:31:53 -0000 1.11
@@ -1392,7 +1392,7 @@
}
// Move elements down
- while (index++ < num)
+ while (++index < num)
{
if (index - 1 >= 0)
{
1.10 +12 -0 jakarta-regexp/xdocs/RETest.txt
Index: RETest.txt
===================================================================
RCS file: /home/cvs/jakarta-regexp/xdocs/RETest.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RETest.txt 2 May 2003 02:28:13 -0000 1.9
+++ RETest.txt 1 Sep 2003 18:31:53 -0000 1.10
@@ -1291,3 +1291,15 @@
acghij
YES
acghij
+
+#214
+[^02468ACEGIKMOQSUW]
+012
+YES
+1
+
+#215
+[^02468ACEGIKMOQSUW]
+UVW
+YES
+V
1.12 +3 -0 jakarta-regexp/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-regexp/xdocs/changes.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- changes.xml 2 Jun 2003 02:18:41 -0000 1.11
+++ changes.xml 1 Sep 2003 18:31:53 -0000 1.12
@@ -17,6 +17,9 @@
<h3>Version 1.3-dev</h3>
<ul>
+<li>Fixed Bug
+ <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22804">22804</a>:
+ ArrayIndexOutOfBoundsException on negated classes (VG)</li>
<li>New Feature: subst() can now process backreferences when flag
REPLACE_BACKREFERENCES is set. See API docs for details.
Patch provided by Tobias Schaefer. (VG)</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]