gjavah.c (print_namelet): Clear subnamelets.

	* gjavah.c (print_namelet): Clear subnamelets.
	(HANDLE_METHOD): Set `method_printed' earlier.

From-SVN: r47801

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b244d2cee6a7f27cba6d2781d606e97c5575e27d..ddba50c79552c5646567698a56fa7ed80232b19f 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-08  Tom Tromey  <tromey@redhat.com>
+
+       * gjavah.c (print_namelet): Clear subnamelets.
+       (HANDLE_METHOD): Set `method_printed' earlier.
+
 2001-12-07  Tom Tromey  <tromey@redhat.com>
 
        * lang.c (lang_f_options): Added

diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 8b91549d12e47f2674e08c5de545ba674c29cb87..00f29f6ad6a1643bd4a7ef91b92d138b9c2bc5fd 100644 (file)
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -193,6 +193,7 @@ static int method_signature = 0;
 #define HANDLE_METHOD(ACCESS_FLAGS, NAME, SIGNATURE, ATTRIBUTE_COUNT)  \
   {                                                                    \
     method_synthetic = 0;                                              \
+    method_printed = 0;                                                        \
     method_signature = SIGNATURE;                                      \
     if (ATTRIBUTE_COUNT)                                               \
       method_synthetic = peek_attribute (jcf, ATTRIBUTE_COUNT,         \
@@ -208,7 +209,7 @@ static int method_signature = 0;
       }                                                                \
     if (method_pass && !method_synthetic)                              \
       {                                                                        \
-       decompiled = 0; method_printed = 0;                             \
+       decompiled = 0;                                                 \
        if (out)                                                        \
          print_method_info (out, jcf, NAME, SIGNATURE,                 \
                             ACCESS_FLAGS);                             \
@@ -1757,6 +1758,7 @@ print_namelet (out, name, depth)
       print_namelet (out, c, depth + 2);
       c = next;
     }
+  name->subnamelets = NULL;
 
   if (name->name)
     {