2
0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-23 09:09:07 +08:00
gcc/libjava/java/text/natCollator.cc

75 lines
1.5 KiB
C++
Raw Normal View History

// natCollator.cc - Native code for collation.
/* Copyright (C) 1999 Free Software Foundation
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. */
// Written by Tom Tromey <tromey@cygnus.com>.
#include <config.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/text/Collator.h>
#include <java/lang/StringBuffer.h>
#include <java-chardecomp.h>
void
java::text::Collator::decomposeCharacter (jchar c,
java::lang::StringBuffer *buf)
{
if (decmp == NO_DECOMPOSITION)
{
buf->append(c);
return;
}
StringBuffer.java (ensureCapacity): Don't resize vector when shared. * 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
1999-04-30 17:31:00 +08:00
const struct decomp_entry *base;
int high;
if (decmp == FULL_DECOMPOSITION)
{
base = full_decomposition;
high = sizeof (full_decomposition) / sizeof (struct decomp_entry);
}
else
{
base = canonical_decomposition;
high = sizeof (canonical_decomposition) / sizeof (struct decomp_entry);
}
// FIXME: this is probably a bit slow for the task at hand.
int i = high / 2;
int low = 0;
while (true)
{
if (c < base[i].key)
high = i;
else if (c > base[i].key)
low = i;
else
break;
int old = i;
i = (high + low) / 2;
if (i == old)
{
// Not in table, so it expands to itself.
buf->append(c);
return;
}
}
for (int j = 0; base[i].value[j] != '\0'; j += 2)
{
jchar x = (base[i].value[j] << 8) | (base[i].value[j + 1]);
buf->append (x);
}
}