dfs 01/10/22 23:42:20
Modified: . CHANGES
src/java/org/apache/oro/text/regex Perl5Compiler.java
Log:
Fixed bug in __parseUnicodeClass() whereby a - would be ignored when
it followed a builtin character class like \w.
Submitted by: George Hart <[EMAIL PROTECTED]>
Revision Changes Path
1.18 +8 -1 jakarta-oro/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/jakarta-oro/CHANGES,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CHANGES 2001/07/25 18:55:09 1.17
+++ CHANGES 2001/10/23 06:42:20 1.18
@@ -1,4 +1,11 @@
-$Id: CHANGES,v 1.17 2001/07/25 18:55:09 dfs Exp $
+$Id: CHANGES,v 1.18 2001/10/23 06:42:20 dfs Exp $
+
+Version 2.x.x
+
+o Fixed bug whereby a - in a Perl expression would be ignored when
+ it followed a builtin character class like \w. In other words,
+ [\w-] behavig like \w instead of like [-\w]. The regression was
+ introduced with the unicode character class patch from version 2.0.2.
Version 2.0.4
1.13 +3 -2
jakarta-oro/src/java/org/apache/oro/text/regex/Perl5Compiler.java
Index: Perl5Compiler.java
===================================================================
RCS file:
/home/cvs/jakarta-oro/src/java/org/apache/oro/text/regex/Perl5Compiler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Perl5Compiler.java 2001/05/20 10:52:26 1.12
+++ Perl5Compiler.java 2001/10/23 06:42:20 1.13
@@ -58,7 +58,7 @@
*/
/*
- * $Id: Perl5Compiler.java,v 1.12 2001/05/20 10:52:26 dfs Exp $
+ * $Id: Perl5Compiler.java,v 1.13 2001/10/23 06:42:20 dfs Exp $
*/
import java.util.*;
@@ -1233,7 +1233,8 @@
} else {
lastclss = clss;
- if(__input._getValue() == '-' &&
+ if(opcodeFlag == false &&
+ __input._getValue() == '-' &&
__input._getOffset() + 1 < __input._getLength() &&
__input._getValueRelative(1) != ']') {
__input._increment();
