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:
@@ -43,19 +43,32 @@ final class RETokenRange extends REToken {
|
||||
|
||||
RETokenRange(int subIndex, char lo, char hi, boolean ins) {
|
||||
super(subIndex);
|
||||
this.lo = (insens = ins) ? Character.toLowerCase(lo) : lo;
|
||||
this.hi = ins ? Character.toLowerCase(hi) : hi;
|
||||
insens = ins;
|
||||
this.lo = lo;
|
||||
this.hi = hi;
|
||||
}
|
||||
|
||||
int getMinimumLength() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
int getMaximumLength() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
boolean match(CharIndexed input, REMatch mymatch) {
|
||||
char c = input.charAt(mymatch.index);
|
||||
if (c == CharIndexed.OUT_OF_BOUNDS) return false;
|
||||
if (insens) c = Character.toLowerCase(c);
|
||||
if ((c >= lo) && (c <= hi)) {
|
||||
boolean matches = (c >= lo) && (c <= hi);
|
||||
if (! matches && insens) {
|
||||
char c1 = Character.toLowerCase(c);
|
||||
matches = (c1 >= lo) && (c1 <= hi);
|
||||
if (!matches) {
|
||||
c1 = Character.toUpperCase(c);
|
||||
matches = (c1 >= lo) && (c1 <= hi);
|
||||
}
|
||||
}
|
||||
if (matches) {
|
||||
++mymatch.index;
|
||||
return next(input, mymatch);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user