diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-09-10 21:45:39 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-09-10 21:45:39 +0000 |
| commit | 58aea4f55da2dbf234dd4a1a9229f2df2ef25134 (patch) | |
| tree | f68d9f6bb83fc593bcd28a3460bee61c75a8065a /gcc/java/gjavah.c | |
| parent | 6cd005c94cd5d597e802d61f4af39cd870ab802f (diff) | |
| download | gcc-58aea4f55da2dbf234dd4a1a9229f2df2ef25134.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29277 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/gjavah.c')
| -rw-r--r-- | gcc/java/gjavah.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index 1fd84931880..3ea5d0e50b4 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; } |