diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/decl.c | 2 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 1 | ||||
| -rw-r--r-- | gcc/java/lang.c | 69 |
4 files changed, 41 insertions, 37 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 614198b..0826451 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2001-11-15 Neil Booth <neil@daikokuya.demon.co.uk> + + * decl.c (init_decl_processing): Rename java_init_decl_processing. + * java-tree.h: New prototype. + * lang.c (java_init): Update prototype. Combine with old init_parse. + 2001-11-13 Tom Tromey <tromey@redhat.com> * gjavah.c (method_signature): New global. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 86b5610..2577122 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -398,7 +398,7 @@ create_primitive_vtable (name) } void -init_decl_processing () +java_init_decl_processing () { register tree endlink; tree field = NULL_TREE; diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index d9417b4..e2e8cf3 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -1031,6 +1031,7 @@ extern tree ident_subst PARAMS ((const char*, int, const char*, int, int, const char*)); extern tree identifier_subst PARAMS ((const tree, const char *, int, int, const char *)); +extern void java_init_decl_processing PARAMS ((void)); extern tree build_java_signature PARAMS ((tree)); extern tree build_java_argument_signature PARAMS ((tree)); extern void set_java_signature PARAMS ((tree, tree)); diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 9ba1849..977ed17 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -48,7 +48,7 @@ struct string_option int on_value; }; -static void java_init PARAMS ((void)); +static const char *java_init PARAMS ((const char *)); static void java_init_options PARAMS ((void)); static int java_decode_option PARAMS ((int, char **)); static void put_decl_string PARAMS ((const char *, int)); @@ -186,7 +186,7 @@ lang_W_options[] = JCF *current_jcf; /* Variable controlling how dependency tracking is enabled in - init_parse. */ + java_init. */ static int dependency_tracking = 0; /* Flag values for DEPENDENCY_TRACKING. */ @@ -411,10 +411,15 @@ java_decode_option (argc, argv) /* Global open file. */ FILE *finput; -const char * -init_parse (filename) +static const char * +java_init (filename) const char *filename; { +#if 0 + extern int flag_minimal_debug; + flag_minimal_debug = 0; +#endif + /* Open input file. */ if (filename == 0 || !strcmp (filename, "-")) @@ -476,6 +481,30 @@ init_parse (filename) } } + jcf_path_init (); + jcf_path_seal (version_flag); + + decl_printable_name = lang_printable_name; + print_error_function = lang_print_error; + lang_expand_expr = java_lang_expand_expr; + + /* Append to Gcc tree node definition arrays */ + + memcpy (tree_code_type + (int) LAST_AND_UNUSED_TREE_CODE, + java_tree_code_type, + (int)LAST_JAVA_TREE_CODE - (int)LAST_AND_UNUSED_TREE_CODE); + memcpy (tree_code_length + (int) LAST_AND_UNUSED_TREE_CODE, + java_tree_code_length, + (LAST_JAVA_TREE_CODE - + (int)LAST_AND_UNUSED_TREE_CODE) * sizeof (int)); + memcpy (tree_code_name + (int) LAST_AND_UNUSED_TREE_CODE, + java_tree_code_name, + (LAST_JAVA_TREE_CODE - + (int)LAST_AND_UNUSED_TREE_CODE) * sizeof (char *)); + java_init_decl_processing (); + + using_eh_for_cleanups (); + return filename; } @@ -677,38 +706,6 @@ lang_print_error (context, file) } -static void -java_init () -{ -#if 0 - extern int flag_minimal_debug; - flag_minimal_debug = 0; -#endif - - jcf_path_init (); - jcf_path_seal (version_flag); - - decl_printable_name = lang_printable_name; - print_error_function = lang_print_error; - lang_expand_expr = java_lang_expand_expr; - - /* Append to Gcc tree node definition arrays */ - - memcpy (tree_code_type + (int) LAST_AND_UNUSED_TREE_CODE, - java_tree_code_type, - (int)LAST_JAVA_TREE_CODE - (int)LAST_AND_UNUSED_TREE_CODE); - memcpy (tree_code_length + (int) LAST_AND_UNUSED_TREE_CODE, - java_tree_code_length, - (LAST_JAVA_TREE_CODE - - (int)LAST_AND_UNUSED_TREE_CODE) * sizeof (int)); - memcpy (tree_code_name + (int) LAST_AND_UNUSED_TREE_CODE, - java_tree_code_name, - (LAST_JAVA_TREE_CODE - - (int)LAST_AND_UNUSED_TREE_CODE) * sizeof (char *)); - - using_eh_for_cleanups (); -} - /* This doesn't do anything on purpose. It's used to satisfy the print_error_function hook we don't print error messages with bogus function prototypes. */ |