* natCollator.cc: New file.
From-SVN: r26655
This commit is contained in:
parent
3cc2608144
commit
6c26973039
2 changed files with 76 additions and 0 deletions
|
@ -1,5 +1,7 @@
|
||||||
1999-04-26 Tom Tromey <tromey@cygnus.com>
|
1999-04-26 Tom Tromey <tromey@cygnus.com>
|
||||||
|
|
||||||
|
* natCollator.cc: New file.
|
||||||
|
|
||||||
* java/util/GregorianCalendar.java (setDefaultTime): New method.
|
* java/util/GregorianCalendar.java (setDefaultTime): New method.
|
||||||
(GregorianCalendar): Use it in all constructors.
|
(GregorianCalendar): Use it in all constructors.
|
||||||
* java/util/Calendar.java (Calendar): Changed argument name to
|
* java/util/Calendar.java (Calendar): Changed argument name to
|
||||||
|
|
74
libjava/java/text/natCollator.cc
Normal file
74
libjava/java/text/natCollator.cc
Normal file
|
@ -0,0 +1,74 @@
|
||||||
|
// 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 <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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue