* lex.c (java_read_char): Check for EOF from getc first.

From-SVN: r39261

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c610918465c2a36d713902aa41244da52ba1ffee..cbe63223b3599ac5858836636222c801474a8734 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-25  Richard Earnshaw  <rearnsha@arm.com>
+
+       * lex.c (java_read_char): Check for EOF from getc first.
+
 2001-01-23  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * class.c (layout_class): Don't lay the superclass out if it's

diff --git a/gcc/java/lex.c b/gcc/java/lex.c
index 32c104e770cb38c5378b4533768980f2db06c91c..fdfb0a7705d5b28aeedb1e09783e1a9d709efe5b 100644 (file)
--- a/gcc/java/lex.c
+++ b/gcc/java/lex.c
@@ -447,10 +447,10 @@ java_read_char (lex)
       int c, c1, c2;
       c = getc (lex->finput);
 
-      if (c < 128)
-       return (unicode_t)c;
       if (c == EOF)
        return UEOF;
+      if (c < 128)
+       return (unicode_t)c;
       else
        {
          if ((c & 0xe0) == 0xc0)