re PR java/7950 (jc1 parses files ending in 0x0d incorrectly)

	* lex.c (java_read_unicode_collapsing_terminators): Handle case
	where \r appears at EOF.  Fixes PR java/7950.

From-SVN: r57258

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e1eb6f145587c00bc7e83610366e944d02f0b583..77612ee87ca57d28b90c3e082d64a041dcfc7ea2 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-17  Tom Tromey  <tromey@redhat.com>
+
+       * lex.c (java_read_unicode_collapsing_terminators): Handle case
+       where \r appears at EOF.  Fixes PR java/7950.
+
 2002-09-16  Geoffrey Keating  <geoffk@apple.com>
 
        * java-tree.h (union lang_tree_node): Add chain_next option.

diff --git a/gcc/java/lex.c b/gcc/java/lex.c
index 026d3cacbd6994c8e3e0a818f399d3c505543075..d8bcfd94e3f63728e8bf003d0cb00404a50dfcbd 100644 (file)
--- a/gcc/java/lex.c
+++ b/gcc/java/lex.c
@@ -599,7 +599,7 @@ java_read_unicode_collapsing_terminators (lex, unicode_escape_p)
         return a single line terminator.  */
       int dummy;
       c = java_read_unicode (lex, &dummy);
-      if (c != '\n')
+      if (c != '\n' && c != UEOF)
        lex->unget_value = c;
       /* In either case we must return a newline.  */
       c = '\n';