mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-21 08:03:41 +08:00
27e934d8ba
* configure: Rebuilt. * configure.in: Build include/Makefile. * Makefile.in: Rebuilt. * Makefile.am (SUBDIRS): Added gcj and include. (install-data-local): New target. (extra_headers): New macro. * include/Makefile.in: New file. * include/Makefile.am: New file. * interpret.cc: Don't include gcj/field.h or gcj/cni.h. * java/lang/reflect/natField.cc: Don't include gcj/field.h or gcj/cni.h. * boehm.cc: Don't include java-threads.h or gcj/field.h. * resolve.cc: Include config.h. * defineclass.cc: Include config.h. * include/java-interp.h: Don't include config.h. * include/jvm.h: Include java-threads.h, Object.h, java-gc.h, cni.h. * gcj/javaprims.h: Regenerated namespace decls. * classes.pl (scan): Don't put `;' after closing brace. * Makefile.in: Rebuilt. * Makefile.am (INCLUDES): Added -I for top_srcdir. * configure.in: Create gcj/Makefile. * gcj/Makefile.in: New file. * gcj/Makefile.am: New file. * java/lang/Object.h: Don't include any other headers. * gcj/array.h: Renamed from include/java-array.h. * gcj/field.h: Renamed from include/java-field.h. * gcj/method.h: Renamed from include/java-method.h. * gcj/cni.h, gcj/javaprims.h: Moved from include/. Updated all files to reflect new include structure. From-SVN: r29278
75 lines
1.5 KiB
C++
75 lines
1.5 KiB
C++
// natCollator.cc - Native code for collation.
|
|
|
|
/* 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. */
|
|
|
|
// 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;
|
|
}
|
|
|
|
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);
|
|
}
|
|
}
|