Imported GNU Classpath 0.90
Imported GNU Classpath 0.90
* scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
* gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
* java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
* java/lang/Math.java: New override file.
* java/lang/Character.java: Merged from Classpath.
(start, end): Now 'int's.
(canonicalName): New field.
(CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
(UnicodeBlock): Added argument.
(of): New overload.
(forName): New method.
Updated unicode blocks.
(sets): Updated.
* sources.am: Regenerated.
* Makefile.in: Likewise.
From-SVN: r111942
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/* gnu/regexp/RESyntax.java
|
||||
Copyright (C) 1998-2002, 2004 Free Software Foundation, Inc.
|
||||
Copyright (C) 2006 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
@@ -202,7 +202,37 @@ public final class RESyntax implements Serializable {
|
||||
*/
|
||||
public static final int RE_POSSESSIVE_OPS = 25;
|
||||
|
||||
private static final int BIT_TOTAL = 26;
|
||||
/**
|
||||
* Syntax bit. Allow embedded flags, (?is-x), as in Perl5.
|
||||
*/
|
||||
public static final int RE_EMBEDDED_FLAGS = 26;
|
||||
|
||||
/**
|
||||
* Syntax bit. Allow octal char (\0377), as in Perl5.
|
||||
*/
|
||||
public static final int RE_OCTAL_CHAR = 27;
|
||||
|
||||
/**
|
||||
* Syntax bit. Allow hex char (\x1b), as in Perl5.
|
||||
*/
|
||||
public static final int RE_HEX_CHAR = 28;
|
||||
|
||||
/**
|
||||
* Syntax bit. Allow Unicode char (\u1234), as in Java 1.4.
|
||||
*/
|
||||
public static final int RE_UNICODE_CHAR = 29;
|
||||
|
||||
/**
|
||||
* Syntax bit. Allow named property (\p{P}, \P{p}), as in Perl5.
|
||||
*/
|
||||
public static final int RE_NAMED_PROPERTY = 30;
|
||||
|
||||
/**
|
||||
* Syntax bit. Allow nested characterclass ([a-z&&[^p-r]]), as in Java 1.4.
|
||||
*/
|
||||
public static final int RE_NESTED_CHARCLASS = 31;
|
||||
|
||||
private static final int BIT_TOTAL = 32;
|
||||
|
||||
/**
|
||||
* Predefined syntax.
|
||||
@@ -422,6 +452,10 @@ public final class RESyntax implements Serializable {
|
||||
.set(RE_STRING_ANCHORS) // \A,\Z
|
||||
.set(RE_CHAR_CLASS_ESC_IN_LISTS)// \d,\D,\w,\W,\s,\S within []
|
||||
.set(RE_COMMENTS) // (?#)
|
||||
.set(RE_EMBEDDED_FLAGS) // (?imsx-imsx)
|
||||
.set(RE_OCTAL_CHAR) // \0377
|
||||
.set(RE_HEX_CHAR) // \x1b
|
||||
.set(RE_NAMED_PROPERTY) // \p{prop}, \P{prop}
|
||||
.makeFinal();
|
||||
|
||||
RE_SYNTAX_PERL5_S = new RESyntax(RE_SYNTAX_PERL5)
|
||||
@@ -431,6 +465,8 @@ public final class RESyntax implements Serializable {
|
||||
RE_SYNTAX_JAVA_1_4 = new RESyntax(RE_SYNTAX_PERL5)
|
||||
// XXX
|
||||
.set(RE_POSSESSIVE_OPS) // *+,?+,++,{}+
|
||||
.set(RE_UNICODE_CHAR) // \u1234
|
||||
.set(RE_NESTED_CHARCLASS) // [a-z&&[^p-r]]
|
||||
.makeFinal();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user