diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 1999-02-08 11:20:39 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 1999-02-08 03:20:39 -0800 |
| commit | acd663ee8d130f87133566064f02b94bedcea9d4 (patch) | |
| tree | fe8affd6a54b3a7c6a1eeab7a46a96cb0e85bed2 /gcc/java/lex.c | |
| parent | 5f784c1db94c3df95d307b9d0688778e0ed7679a (diff) | |
| download | gcc-acd663ee8d130f87133566064f02b94bedcea9d4.zip gcc-acd663ee8d130f87133566064f02b94bedcea9d4.tar.gz gcc-acd663ee8d130f87133566064f02b94bedcea9d4.tar.bz2 | |
lex.c (java_read_char): Fixed utf8 decoding.
Fri Jan 29 18:19:02 1999 Alexandre Petit-Bianco <apbianco@cygnus.com>
* lex.c (java_read_char): Fixed utf8 decoding.
(java_unicode_2_utf8): Fixed utf8 encoding in the 0x800-0xffff
range.
* parse.y (valid_builtin_assignconv_identity_widening_p): Fixed
comments. Local variable `all_primitive' is gone. Broadened
acceptance of `0' to floating point targets. `long' can now be
widened to `double' or `float'.
(valid_method_invocation_conversion_p): Added leading
comment. Fixed tabulation.
(build_string_concatenation): Optimize out left or right empty
string constants.
From-SVN: r25078
Diffstat (limited to 'gcc/java/lex.c')
| -rw-r--r-- | gcc/java/lex.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/java/lex.c b/gcc/java/lex.c index e1e1074..1765a15 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -216,19 +216,19 @@ java_read_char () return UEOF; else { - if (c & (0xe0 == 0xc0)) + if ((c & 0xe0) == 0xc0) { c1 = GETC (); - if (c1 & (0xc0 == 0x80)) + if ((c1 & 0xc0) == 0x80) return (unicode_t)(((c &0x1f) << 6) + (c1 & 0x3f)); } - else if (c & (0xf0 == 0xe0)) + else if ((c & 0xf0) == 0xe0) { c1 = GETC (); - if (c1 & (0xc0 == 0x80)) + if ((c1 & 0xc0) == 0x80) { c2 = GETC (); - if (c2 & (0xc0 == 0x80)) + if ((c2 & 0xc0) == 0x80) return (unicode_t)(((c & 0xf) << 12) + (( c1 & 0x3f) << 6) + (c2 & 0x3f)); } @@ -1274,7 +1274,7 @@ java_unicode_2_utf8 (unicode) obstack_1grow (&temporary_obstack, (unsigned char)(0x80 | (unicode & 0x0fc0) >> 6)); obstack_1grow (&temporary_obstack, - (unsigned char)(0x80 | (unicode & 0x003f) >> 12)); + (unsigned char)(0x80 | (unicode & 0x003f))); } } |