mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-25 07:18:57 +08:00
a0e894a8cc
* java/lang/StringBuffer.java (ensureCapacity): Don't resize vector when shared. * java/util/Locale.java (Locale(String,String)): Implement in terms of 3-argument version; variant now defaults to empty string. (toString): Assume variant is not null. (equals): Assume all strings are not null. (Locale): Throw NullPointerException if any argument is null. * java/util/ResourceBundle.java (getBundle): Don't try the base name; now implicit in partialGetBundle call. (trySomeGetBundle): Search for parent bundles and call setParent as required. (partialGetBundle): Added `langStop' argument. Use `Locale.toString' to compute bundleName. (resource_cache): New static field. (partialGetBundle): Cache the returned resource bundle. Now synchronized. * gnu/gcj/text/LocaleData_en.java (contents): [collatorRule] Added missing `<'. * mauve-libgcj: Enable Collator and RuleBasedCollator. * java/text/natCollator.cc (decomposeCharacter): `base' now `const'. * Makefile.in: Rebuilt. * Makefile.am (ordinary_java_source_files): Added CollationElementIterator, CollationKey, Collator, RuleBasedCollator. (nat_source_files): Added natCollator.cc. * java/text/RuleBasedCollator.java (ceiNext): No longer static. (compare): Pass `this' to CollationElementIterator constructor. (getCollationElementIterator): Likewise. (ceiNext): Fix off-by-one error when finding initial substring. (next): Correctly mask off bits when computing return value. Fixed return values when one string is shorter than the other. * java/text/CollationElementIterator.java (collator): New field. (CollationElementIterator): Added collator argument. (next): Call ceiNext on collator object. From-SVN: r26707
80 lines
1.7 KiB
Java
80 lines
1.7 KiB
Java
// CollationElementIterator.java - Iterate over decomposed characters.
|
|
|
|
/* Copyright (C) 1999 Cygnus Solutions
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
package java.text;
|
|
|
|
/**
|
|
* @author Tom Tromey <tromey@cygnus.com>
|
|
* @date March 25, 1999
|
|
*/
|
|
/* Written using "Java Class Libraries", 2nd edition, plus online
|
|
* API docs for JDK 1.2 from http://www.javasoft.com.
|
|
* Status: Believed complete and correct to JDK 1.1.
|
|
*/
|
|
|
|
public final class CollationElementIterator
|
|
{
|
|
public static final int NULLORDER = 0xffffffff;
|
|
|
|
public int next ()
|
|
{
|
|
if (index == text.length())
|
|
return NULLORDER;
|
|
return collator.ceiNext(this);
|
|
}
|
|
|
|
// This one returns int while the others return short.
|
|
public static final int primaryOrder (int order)
|
|
{
|
|
// From the JDK 1.2 spec.
|
|
return order >>> 16;
|
|
}
|
|
|
|
public void reset ()
|
|
{
|
|
index = 0;
|
|
}
|
|
|
|
public static final short secondaryOrder (int order)
|
|
{
|
|
// From the JDK 1.2 spec.
|
|
return (order >>> 8) & 255;
|
|
}
|
|
|
|
public static final short tertiaryOrder (int order)
|
|
{
|
|
// From the JDK 1.2 spec.
|
|
return order & 255;
|
|
}
|
|
|
|
// Non-public constructor.
|
|
CollationElementIterator (String text, RuleBasedCollator collator)
|
|
{
|
|
this.text = text;
|
|
this.index = 0;
|
|
this.lookahead_set = false;
|
|
this.lookahead = 0;
|
|
this.collator = collator;
|
|
}
|
|
|
|
// Text over which we iterate.
|
|
String text;
|
|
|
|
// Index of next character to examine in TEXT.
|
|
int index;
|
|
|
|
// A piece of lookahead.
|
|
boolean lookahead_set;
|
|
int lookahead;
|
|
|
|
// The RuleBasedCollator which created this object.
|
|
RuleBasedCollator collator;
|
|
}
|