diff options
| author | Chris Burdess <dog@gnu.org> | 2006-01-09 23:22:45 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-01-09 23:22:45 +0000 |
| commit | 42801b989af277b4c094cce7e2d0136730bea815 (patch) | |
| tree | 0423a3595eaff136a9c4d396c7e5c88724cdc78b /libjava/java/lang/Character.java | |
| parent | f289c6a1cb479433162690699c672d75d83ae4a9 (diff) | |
| download | gcc-42801b989af277b4c094cce7e2d0136730bea815.zip gcc-42801b989af277b4c094cce7e2d0136730bea815.tar.gz gcc-42801b989af277b4c094cce7e2d0136730bea815.tar.bz2 | |
Character.java (toChars,toCodePoint): Correct these methods to use algorithms from Unicode specification.
2006-01-08 Chris Burdess <dog@gnu.org>
* java/lang/Character.java (toChars,toCodePoint): Correct these
methods to use algorithms from Unicode specification.
From-SVN: r109516
Diffstat (limited to 'libjava/java/lang/Character.java')
| -rw-r--r-- | libjava/java/lang/Character.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libjava/java/lang/Character.java b/libjava/java/lang/Character.java index 3cb73d0..f56117f 100644 --- a/libjava/java/lang/Character.java +++ b/libjava/java/lang/Character.java @@ -2320,11 +2320,11 @@ public final class Character implements Serializable, Comparable { // Write second char first to cause IndexOutOfBoundsException // immediately. - dst[dstIndex + 1] = (char) ((codePoint & 0x3ff) - + (int) MIN_LOW_SURROGATE ); - dst[dstIndex] = (char) ((codePoint >> 10) + (int) MIN_HIGH_SURROGATE); + final int cp2 = codePoint - 0x10000; + dst[dstIndex + 1] = (char) ((cp2 % 0x400) + (int) MIN_LOW_SURROGATE); + dst[dstIndex] = (char) ((cp2 / 0x400) + (int) MIN_HIGH_SURROGATE); result = 2; - } + } else { dst[dstIndex] = (char) codePoint; @@ -2433,7 +2433,8 @@ public final class Character implements Serializable, Comparable */ public static int toCodePoint(char high, char low) { - return ((high - MIN_HIGH_SURROGATE) << 10) + (low - MIN_LOW_SURROGATE); + return ((high - MIN_HIGH_SURROGATE) * 0x400) + + (low - MIN_LOW_SURROGATE) + 0x10000; } /** |