mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-22 18:19:43 +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
102 lines
2.2 KiB
C++
102 lines
2.2 KiB
C++
/* 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. */
|
|
|
|
#include <config.h>
|
|
#include <gcj/cni.h>
|
|
#include <gnu/gcj/convert/Input_EUCJIS.h>
|
|
|
|
#define ERROR_CHAR 0xFFFD
|
|
|
|
extern unsigned short JIS0208_to_Unicode[84][94];
|
|
extern unsigned short JIS0212_to_Unicode[76][94];
|
|
|
|
jint
|
|
gnu::gcj::convert::Input_EUCJIS::read(jcharArray outbuffer, jint outpos,
|
|
jint count)
|
|
{
|
|
jint start_outpos = outpos;
|
|
for (;;)
|
|
{
|
|
if (outpos - start_outpos >= count)
|
|
break;
|
|
if (inpos >= inlength)
|
|
break;
|
|
int b = ((unsigned char*) elements(inbuffer))[inpos++];
|
|
if (codeset == 0) // ASCII or JIS-Roman
|
|
{
|
|
if (b < 128)
|
|
{
|
|
#if 1
|
|
// Technically, we should translate 0x5c to Yen symbol;
|
|
// in practice, it is not clear.
|
|
if (b == 0x5c)
|
|
b = 0x00A5; // Yen sign.
|
|
#endif
|
|
elements(outbuffer)[outpos++] = (char) b;
|
|
}
|
|
else
|
|
{
|
|
if (b == 0x8E) // SS2
|
|
codeset = 2;
|
|
else if (b == 0x8F) // SS3
|
|
codeset = 3;
|
|
else
|
|
{
|
|
codeset = 1;
|
|
first_byte = b;
|
|
}
|
|
}
|
|
}
|
|
else if (codeset == 1) // JIS X 0208:1997
|
|
{
|
|
first_byte -= 0x80 + 33;
|
|
b -= 0x80 + 33;
|
|
if ((unsigned) first_byte >= 84 || (unsigned) b >= 94)
|
|
b = ERROR_CHAR;
|
|
else
|
|
{
|
|
b = JIS0208_to_Unicode[first_byte][b];
|
|
if (b == 0)
|
|
b = ERROR_CHAR;
|
|
}
|
|
elements(outbuffer)[outpos++] = b;
|
|
codeset = 0;
|
|
}
|
|
else if (codeset == 2) // Half-width katakana
|
|
{
|
|
if (b >= 0xA1 && b <= 0xDF)
|
|
b += 0xFF61 - 0xA1;
|
|
else
|
|
b = ERROR_CHAR;
|
|
elements(outbuffer)[outpos++] = b;
|
|
codeset = 0;
|
|
}
|
|
else if (codeset == 3) // second byte of JIS X 0212-1990
|
|
{
|
|
first_byte = b;
|
|
codeset = 4;
|
|
}
|
|
else // codeset == 4 // third byte of JIS X 0212-1990
|
|
{
|
|
first_byte -= 0x80 + 34;
|
|
b -= 0x80 + 33;
|
|
if ((unsigned) first_byte >= 76 || (unsigned) b >= 94)
|
|
b = ERROR_CHAR;
|
|
else
|
|
{
|
|
b = JIS0208_to_Unicode[first_byte][b];
|
|
if (b == 0)
|
|
b = ERROR_CHAR;
|
|
}
|
|
elements(outbuffer)[outpos++] = b;
|
|
codeset = 0;
|
|
}
|
|
}
|
|
return outpos - start_outpos;
|
|
}
|