jon 2002/12/13 10:23:55
Modified: docs RETest.txt
src/java/org/apache/regexp RECompiler.java
xdocs RETest.txt changes.xml
Log:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7288
Revision Changes Path
1.6 +18 -0 jakarta-regexp/docs/RETest.txt
Index: RETest.txt
===================================================================
RCS file: /home/cvs/jakarta-regexp/docs/RETest.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RETest.txt 13 Dec 2002 18:11:57 -0000 1.5
+++ RETest.txt 13 Dec 2002 18:23:55 -0000 1.6
@@ -1043,3 +1043,21 @@
\bfly\b
housefly
NO
+
+#171
+[^ac]+
+bd
+YES
+bd
+
+#172
+[^ca]+
+bd
+YES
+bd
+
+#173
+[^ac]+
+acb
+YES
+b
\ No newline at end of file
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RECompiler.java 13 Dec 2002 17:47:34 -0000 1.6
+++ RECompiler.java 13 Dec 2002 18:23:55 -0000 1.7
@@ -1453,11 +1453,11 @@
int minr = minRange[i];
int maxr = maxRange[i];
delete(i);
- if (minr < min - 1)
+ if (minr < min)
{
merge(minr, min - 1);
}
- if (max + 1 < maxr)
+ if (max < maxr)
{
merge(max + 1, maxr);
}
1.5 +18 -0 jakarta-regexp/xdocs/RETest.txt
Index: RETest.txt
===================================================================
RCS file: /home/cvs/jakarta-regexp/xdocs/RETest.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RETest.txt 13 Dec 2002 18:11:57 -0000 1.4
+++ RETest.txt 13 Dec 2002 18:23:55 -0000 1.5
@@ -1043,3 +1043,21 @@
\bfly\b
housefly
NO
+
+#171
+[^ac]+
+bd
+YES
+bd
+
+#172
+[^ca]+
+bd
+YES
+bd
+
+#173
+[^ac]+
+acb
+YES
+b
1.6 +2 -0 jakarta-regexp/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-regexp/xdocs/changes.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 13 Dec 2002 18:11:57 -0000 1.5
+++ changes.xml 13 Dec 2002 18:23:55 -0000 1.6
@@ -18,6 +18,8 @@
<h3>Version 1.3-dev</h3>
<ul>
<li>Applied patches for Bug
+ <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=7288";>7288</a>.
(JSS)</li>
+<li>Applied patches for Bug
<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=986";>986</a>.
(JSS)</li>
<li>Applied patches for Bug
<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3877";>3877</a>.
(JSS)</li>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
