diff options
| author | Ito Kazumitsu <kaz@maczuka.gcd.org> | 2006-07-25 14:34:49 +0000 |
|---|---|---|
| committer | Ito Kazumitsu <kaz@maczuka.gcd.org> | 2006-07-25 14:34:49 +0000 |
| commit | 0dfcdeae3483e525a255235aaec31a770a32574f (patch) | |
| tree | 3c1871b1c0cc424f497bf2598c333fdf03bb055b /java/util/regex/Pattern.java | |
| parent | 59e6156e0e792d9b6bdf0d474cb8154fc19f080c (diff) | |
| download | classpath-0dfcdeae3483e525a255235aaec31a770a32574f.tar.gz | |
2006-07-25 Ito Kazumitsu <kaz@maczuka.gcd.org>
Fixes bug #28413
* gnu/java/util/regex/RETokenEnd.java(check_java_line_terminators):
New field.
(RETokenEnd): New constructer to set check_java_line_terminators.
(matchThis): Checck line terminators if check_java_line_terminators.
* gnu/java/util/regex/RETokenStart.java: Likewise.
* gnu/regexp/RE.java(initialize): Use the new constructors for
RETokenEnd and RETokenStart if REG_MULTILINE is set.
* java/util/regex/Pattern.java(Patteren): Changed so that
gnu/regexp/RE.java may use the new the new constructors.
Diffstat (limited to 'java/util/regex/Pattern.java')
| -rw-r--r-- | java/util/regex/Pattern.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/util/regex/Pattern.java b/java/util/regex/Pattern.java index 89e67f9b4..d716fa4e6 100644 --- a/java/util/regex/Pattern.java +++ b/java/util/regex/Pattern.java @@ -73,12 +73,17 @@ public final class Pattern implements Serializable this.regex = regex; this.flags = flags; + RESyntax syntax = RESyntax.RE_SYNTAX_JAVA_1_4; 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; + { + gnuFlags |= RE.REG_MULTILINE; + syntax = new RESyntax(syntax); + syntax.setLineSeparator(null); + } if ((flags & DOTALL) != 0) gnuFlags |= RE.REG_DOT_NEWLINE; if ((flags & UNICODE_CASE) != 0) @@ -86,7 +91,6 @@ public final class Pattern implements Serializable // not yet supported: // if ((flags & CANON_EQ) != 0) gnuFlags = - RESyntax syntax = RESyntax.RE_SYNTAX_JAVA_1_4; if ((flags & UNIX_LINES) != 0) { // Use a syntax set with \n for linefeeds? |