re GNATS gcj/147 (Problem parsing comments)

2000-02-15  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* lex.c (java_parse_doc_section): Alway unget the last unicode
	when returning 0.
	(java_lex): Call java_parse_end_comment with fetched unicode.

This is a fix to the Java PR #47
(http://sourceware.cygnus.com/ml/java-prs/2000-q1/msg00042.html)

From-SVN: r32097

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8b631e0625a069c1730b9e49d0feda042fe2469f..8a6fdef8ba84b325a0711365cec5e7ff8a3aba8f 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -52,6 +52,12 @@ Thu Feb 17 13:20:58 2000  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * Make-lang.in (jvspec.o): Depend on $(GCC_H), not gcc.h.
 
+2000-02-15  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * lex.c (java_parse_doc_section): Alway unget the last unicode
+       when returning 0.
+       (java_lex): Call java_parse_end_comment with fetched unicode.
+
 2000-02-15  Tom Tromey  <tromey@cygnus.com>
 
        * gjavah.c (jni_print_char): New function.

diff --git a/gcc/java/lex.c b/gcc/java/lex.c
index 58df299f1a5f007add2d5c6eb439221214782916..311f697457f93f064d7944ef7b125abaf3aa4c9f 100644 (file)
--- a/gcc/java/lex.c
+++ b/gcc/java/lex.c
@@ -438,13 +438,12 @@ java_parse_doc_section (c)
       
       if (c == UEOF)
        java_lex_error ("Comment not terminated at end of input", 0);
-      
-      java_unget_unicode ();
       tag [tag_index] = '\0';
 
       if (!strcmp (tag, "deprecated"))
        ctxp->deprecated = 1;
     }
+  java_unget_unicode ();
   return 0;
 }
 
@@ -619,7 +618,7 @@ java_lex (java_lval)
                goto step1;
            }
 
-         java_parse_end_comment (c);
+         java_parse_end_comment ((c = java_get_unicode ()));
          goto step1;
          break;
        default: