diff options
| author | Ito Kazumitsu <kaz@maczuka.gcd.org> | 2006-04-12 21:40:25 +0000 |
|---|---|---|
| committer | Ito Kazumitsu <kaz@maczuka.gcd.org> | 2006-04-12 21:40:25 +0000 |
| commit | e654f5e432f4d865550e7d1362dc2e40bf483f09 (patch) | |
| tree | a2d11071b446e73b29d04bcc131acb88ec13ae3b /java/util/regex/Pattern.java | |
| parent | 55de1c9c77ffccfd5187eb93b488784ff5ac8f3b (diff) | |
| download | classpath-e654f5e432f4d865550e7d1362dc2e40bf483f09.tar.gz | |
2006-04-09 Ito Kazumitsu <kaz@maczuka.gcd.org>
* gnu/regexp/REToken.java(unicodeAware): New field,
(toLowerCase, toUpperCase): New methods.
* gnu/regexp/RETokenBackRef.java, gnu/regexp/RETokenChar.java,
gnu/regexp/RETokenNamedProperty.java, gnu/regexp/RETokenRange.java:
Use toLowerCase and toUpperCase defined in REToken instead of
those defined in java.lang.Character.
* gnu/regexp/gnu/regexp/RE.java(REG_ICASE_USASCII): New flag.
(initialize): Sets unicodeAware of the generated REToken to false if
REG_ICASE_USASCII is set.
* gnu/regexp/RETokenChar.java(constructor): Don't convert the character
to lower case and keep the original value.
(matchOneString): Use the new method charEquals to compare characters.
(charEquals): New method to compare characters.
* java/util/regex/Pattern.java: Sets the flag REG_ICASE_USASCII to true.
Diffstat (limited to 'java/util/regex/Pattern.java')
| -rw-r--r-- | java/util/regex/Pattern.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/util/regex/Pattern.java b/java/util/regex/Pattern.java index 28913642b..8c1998343 100644 --- a/java/util/regex/Pattern.java +++ b/java/util/regex/Pattern.java @@ -74,14 +74,16 @@ public final class Pattern implements Serializable this.flags = flags; int gnuFlags = 0; + gnuFlags |= RE.REG_ICASE_USASCII; if ((flags & CASE_INSENSITIVE) != 0) gnuFlags |= RE.REG_ICASE; if ((flags & MULTILINE) != 0) gnuFlags |= RE.REG_MULTILINE; if ((flags & DOTALL) != 0) gnuFlags |= RE.REG_DOT_NEWLINE; + if ((flags & UNICODE_CASE) != 0) + gnuFlags &= ~RE.REG_ICASE_USASCII; // not yet supported: - // if ((flags & UNICODE_CASE) != 0) gnuFlags = // if ((flags & CANON_EQ) != 0) gnuFlags = RESyntax syntax = RESyntax.RE_SYNTAX_JAVA_1_4; |