gjavah.c (add_class_decl): Generate include for gcj/array.h, not java-array.h.

	* gjavah.c (add_class_decl): Generate include for gcj/array.h, not
	java-array.h.
	(decode_signature_piece): Don't emit "::" in JArray<>.
	(print_namelet): Only print trailing `;' when printing a class.

From-SVN: r29277

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 981a3df10f19da7479c1c1e4d06836c609abad0c..e9b6b89d080d517324b61d16fa49a5fb64441032 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+1999-09-07  Tom Tromey  <tromey@cygnus.com>
+
+       * gjavah.c (add_class_decl): Generate include for gcj/array.h, not
+       java-array.h.
+       (decode_signature_piece): Don't emit "::" in JArray<>.
+       (print_namelet): Only print trailing `;' when printing a class.
+
 Fri Sep 10 10:32:32 1999  Bernd Schmidt  <bernds@cygnus.co.uk>
 
        * java-tree.h: Delete declarations for all tree nodes now moved to

diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 1fd8493188095fc4fe7086c2875b7ca22d250a4d..3ea5d0e50b4bfb6a8be5dc535c31d828b625910a 100644 (file)
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -726,7 +726,7 @@ decode_signature_piece (stream, signature, limit, need_space)
          /* We have to generate a reference to JArray here, so that
             our output matches what the compiler does.  */
          ++signature;
-         fputs ("JArray<::", stream);
+         fputs ("JArray<", stream);
          while (signature < limit && *signature != ';')
            {
              int ch = UTF8_GET (signature, limit);
@@ -1215,7 +1215,10 @@ print_namelet (out, name, depth)
        {
          for (i = 0; i < depth; ++i)
            fputc (' ', out);
-         fputs ("};\n", out);
+         fputs ("}\n", out);
+         /* Only print a `;' when printing a class.  C++ is evil.  */
+         if (name->is_class)
+           fputs (";", out);
        }
 
       free (name->name);
@@ -1247,7 +1250,7 @@ add_class_decl (out, jcf, signature)
       /* If we see an array, then we include the array header.  */
       if (s[i] == '[')
        {
-         print_include (out, "java-array", -1);
+         print_include (out, "gcj/array", -1);
          continue;
        }