re GNATS gcj/119 (gcjh needs to output space before leading "::" with JArray's)

	* gjavah.c (decode_signature_piece): Print "::" in JArray<>.  This
	fixes PR gcj/119.
	(process_file): Use `\n\' at end of each line in string.

From-SVN: r30997

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 2f8941dcc5b86e8de3b745304f92a1856f6b0390..e023857679001dbd9ab956a256f8ea47b54ccea9 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+1999-12-17  Tom Tromey  <tromey@cygnus.com>
+
+       * gjavah.c (decode_signature_piece): Print "::" in JArray<>.  This
+       fixes PR gcj/119.
+       (process_file): Use `\n\' at end of each line in string.
+
 Tue Dec 14 14:20:16 1999  Per Bothner  <per@bothner.com>
 
        * class.c (make_class_data): flag_keep_inline_functions to keep

diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index a29cb62b87a5ebe6bb9c5762d41c073eba9ea3db..12cb72b0f05963b26c79f4c2798fab996c1a1c07 100644 (file)
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -726,7 +726,8 @@ 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);
+         /* Space between `<' and `:' to avoid C++ digraphs.  */
+         fputs ("JArray< ::", stream);
          while (signature < limit && *signature != ';')
            {
              int ch = UTF8_GET (signature, limit);
@@ -1357,11 +1358,11 @@ DEFUN(process_file, (jcf, out),
               out);
       else
        {
-         fputs ("// This file was created by `gcjh -stubs'.  It is -*- c++ -*-.
-//
-// This file is intended to give you a head start on implementing native 
-// methods using CNI.  
-// Be aware: running `gcjh -stubs' once more for this class may overwrite any 
+         fputs ("// This file was created by `gcjh -stubs'.  It is -*- c++ -*-.\n\
+//\n\
+// This file is intended to give you a head start on implementing native\n\
+// methods using CNI.\n\
+// Be aware: running `gcjh -stubs' once more for this class may overwrite any\n\
 // edits you have made to this file.\n\n", out);
        }
     }