vgritsenko 2003/12/20 09:52:10
Modified: docs RETest.txt changes.html
src/java/org/apache/regexp RECompiler.java
xdocs RETest.txt changes.xml
Log:
Bug #3773: Problem with parsing greedy match modifiers
Revision Changes Path
1.13 +10 -0 jakarta-regexp/docs/RETest.txt
Index: RETest.txt
===================================================================
RCS file: /home/cvs/jakarta-regexp/docs/RETest.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RETest.txt 20 Dec 2003 17:21:44 -0000 1.12
+++ RETest.txt 20 Dec 2003 17:52:10 -0000 1.13
@@ -1454,3 +1454,13 @@
YES
1
V
+
+#216
+UUID=(\w{8}\.){3}\w{8}
+UUID=3babc217.0007d4e1.74726163.006e616d
+YES
+4
+UUID=3babc217.0007d4e1.74726163.006e616d
+3babc217.
+0007d4e1.
+74726163.
1.16 +3 -0 jakarta-regexp/docs/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-regexp/docs/changes.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- changes.html 18 Nov 2003 14:14:13 -0000 1.15
+++ changes.html 20 Dec 2003 17:52:10 -0000 1.16
@@ -85,6 +85,9 @@
<h3>Version 1.4-dev</h3>
<ul>
<li>Applied patches for Bug
+ <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3773";>3773</a>:
+ Problem with parsing greedy match modifiers (VG)</li>
+<li>Applied patches for Bug
<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3273";>3273</a>:
CharacterArrayCharacterIterator docs and implementation mismatch (VG)</li>
<li>Fixed Bug
1.12 +13 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RECompiler.java 1 Sep 2003 18:31:53 -0000 1.11
+++ RECompiler.java 20 Dec 2003 17:52:10 -0000 1.12
@@ -1066,6 +1066,18 @@
{
if (bracketMin[i] > 0 || bracketOpt[i] != 0) {
// Rewind stream and run it through again - more
matchers coming
+ for (int j = 0; j < brackets; j++) {
+ if (j != i && bracketStart[j] < idx
+ && bracketStart[j] >= idxBeforeTerminal)
+ {
+ brackets--;
+ bracketStart[j] = bracketStart[brackets];
+ bracketEnd[j] = bracketEnd[brackets];
+ bracketMin[j] = bracketMin[brackets];
+ bracketOpt[j] = bracketOpt[brackets];
+ }
+ }
+
idx = idxBeforeTerminal;
} else {
// Bug #1030: No optinal matches - no need to rewind
1.12 +10 -0 jakarta-regexp/xdocs/RETest.txt
Index: RETest.txt
===================================================================
RCS file: /home/cvs/jakarta-regexp/xdocs/RETest.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RETest.txt 20 Dec 2003 17:21:44 -0000 1.11
+++ RETest.txt 20 Dec 2003 17:52:10 -0000 1.12
@@ -1454,3 +1454,13 @@
YES
1
V
+
+#216
+UUID=(\w{8}\.){3}\w{8}
+UUID=3babc217.0007d4e1.74726163.006e616d
+YES
+4
+UUID=3babc217.0007d4e1.74726163.006e616d
+3babc217.
+0007d4e1.
+74726163.
1.16 +3 -0 jakarta-regexp/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-regexp/xdocs/changes.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- changes.xml 18 Nov 2003 14:14:13 -0000 1.15
+++ changes.xml 20 Dec 2003 17:52:10 -0000 1.16
@@ -18,6 +18,9 @@
<h3>Version 1.4-dev</h3>
<ul>
<li>Applied patches for Bug
+ <a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3773";>3773</a>:
+ Problem with parsing greedy match modifiers (VG)</li>
+<li>Applied patches for Bug
<a href="http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3273";>3273</a>:
CharacterArrayCharacterIterator docs and implementation mismatch (VG)</li>
<li>Fixed Bug
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
