diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-09-10 21:45:39 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-09-10 21:45:39 +0000 |
| commit | 512d594b4f7945440be373bf14c6af8b88c91749 (patch) | |
| tree | f68d9f6bb83fc593bcd28a3460bee61c75a8065a | |
| parent | 973a648b87fcb026397eaf72264b996cb314b8b3 (diff) | |
| download | gcc-512d594b4f7945440be373bf14c6af8b88c91749.zip gcc-512d594b4f7945440be373bf14c6af8b88c91749.tar.gz gcc-512d594b4f7945440be373bf14c6af8b88c91749.tar.bz2 | |
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
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/gjavah.c | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 981a3df..e9b6b89 100644 --- 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 1fd8493..3ea5d0e 100644 --- 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; } |