+2000-07-02 Bryce McKinlay <bryce@albatross.co.nz>
+
+ * gjavah.c (HANDLE_METHOD): Call print_method_info with a NULL stream
+ argument on the first pass for CNI as well as JNI.
+ (print_method_info): Set up method name on the first pass only.
+
2000-06-29 Alexandre Petit-Bianco <apbianco@cygnus.com>
* jcf-write.c (push_long_const): Appropriately cast short negative
if (out) \
print_method_info (out, jcf, NAME, SIGNATURE, ACCESS_FLAGS); \
} \
- else if (flag_jni) \
- print_method_info (NULL, jcf, NAME, SIGNATURE, ACCESS_FLAGS); \
- else if (! stubs) add_class_decl (out, jcf, SIGNATURE);
+ else \
+ { \
+ print_method_info (NULL, jcf, NAME, SIGNATURE, ACCESS_FLAGS); \
+ if (! stubs && ! flag_jni) \
+ add_class_decl (out, jcf, SIGNATURE); \
+ }
#define HANDLE_CODE_ATTRIBUTE(MAX_STACK, MAX_LOCALS, CODE_LENGTH) \
if (out && method_declared) decompile_method (out, jcf, CODE_LENGTH);
free (override);
}
+
static void
DEFUN(print_method_info, (stream, jcf, name_index, sig_index, flags),
FILE *stream AND JCF* jcf
else
return;
}
- else
+
+ /* During the first method pass, build a list of method names. This will
+ be used to determine if field names conflict with method names. */
+ if (! stream)
{
struct method_name *nn;
memcpy (nn->signature, JPOOL_UTF_DATA (jcf, sig_index),
nn->sig_length);
method_name_list = nn;
+
+ /* The rest of this function doesn't matter. */
+ return;
}
- /* If we're not printing, then the rest of this function doesn't
- matter. This happens during the first method pass in JNI mode.
- Eww. */
- if (! stream)
- return;
-
/* We don't worry about overrides in JNI mode. */
if (! flag_jni)
{