diff options
author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-11-15 10:01:10 +0000 |
---|---|---|
committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-11-15 10:01:10 +0000 |
commit | 9ceb1c2907775b4c7ec85297d865873057c95a76 (patch) | |
tree | cac90266aeb52525edc15fddc73e9428ce8a8556 /gcc/objc | |
parent | 3e6f9f2db90fbb87b3a62e08ec2682c7591588c2 (diff) | |
download | gcc-9ceb1c2907775b4c7ec85297d865873057c95a76.tar.gz |
* c-common.c: Include c-lex.h.
(c_common_lang_init): Change prototype. Call init_c_lex and
init_pragma from here.
* c-common.h (c_common_lang_init): Change prototype.
* c-decl.c (init_decl_processing): Rename. Call c_parse_init.
* c-lang.c (c_init): Change prototype. Update.
(c_init_options): Update.
* c-lex.c (cpp_filename): Remove.
(init_c_lex): Update. Read the main file, and get the original
file name.
(yyparse): Finish the command line options.
* c-parse.in (c_parse_init): Call init_reswords here.
(init_parse): Remove.
* c-tree.h (c_init_decl_processing): New.
* cpphash.c (_cpp_init_hashtable): After initializing the hash
table, populate it.
* cppinit.c (read_original_filename, cpp_finish_options): New.
(cpp_create_reader): New prototype. Defer hash table initialization.
(cpp_start_read): Rename cpp_read_main_file. Initialize the
hash table. Get the original filename.
* cpplib.h (cpp_create_reader): Update.
(cpp_start_read): Remove.
(cpp_read_main_file, cpp_finish_options): New.
* cppmain.c (main, do_preprocessing): Update.
* langhooks.h (struct langhooks): Update init prototype.
* toplev.c (general_init, parse_options_and_default_flags,
process_options, lang_indpendent_init, lang_dependent_init,
init_asm_output): New; perform the bulk of initialization.
(compile_file): Move most of initialization to above functions.
(debug_hooks): Initialize statically.
(set_Wunused): Relocate.
(toplev_main): Move most of initialization to other init functions.
Have a clear logic flow.
* tree.h (init_parse, init_decl_processing): Remove.
ada:
* misc.c (gnat_init): Change prototype. Include the
functionality of the old init_parse and init_decl_processing.
(gnat_init_decl_processing): New prototype.
(init_parse): Remove.
* utils.c (init_decl_processing): Rename gnat_init_decl_processing.
cp: * cp-tree.h (init_reswords, cxx_init_decl_processing): New.
(cxx_init): Update prototype.
* decl.c (init_decl_processing): Rename. Move null node init
to its creation time.
* lex.c (cxx_init_options): Update.
(cxx_init): Combine with old init_parse; also call
cxx_init_decl_processing.
f: * com.c (ffecom_init_decl_processing): Renamed from
init_decl_processing.
(init_parse): Move contents to ffe_init.
(ffe_init): Update prototype.
java: * 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.
objc: * objc-act.c (objc_init): Update prototype, combine with old
init_parse.
(objc_init_options): Update.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47046 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objc')
-rw-r--r-- | gcc/objc/objc-act.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 2d345882c2d..3dd0a33a50e 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -157,7 +157,7 @@ char *util_firstobj; static void init_objc PARAMS ((void)); static void finish_objc PARAMS ((void)); -static void objc_init PARAMS ((void)); +static const char *objc_init PARAMS ((const char *)); static void objc_init_options PARAMS ((void)); static int objc_decode_option PARAMS ((int, char **)); static void objc_post_options PARAMS ((void)); @@ -545,20 +545,25 @@ generate_struct_by_value_array () static void objc_init_options () { - parse_in = cpp_create_reader (ident_hash, CLK_OBJC); + parse_in = cpp_create_reader (CLK_OBJC); c_language = clk_objective_c; } -static void -objc_init () +static const char * +objc_init (filename) + const char *filename; { + c_init_decl_processing (); + + filename = c_common_lang_init (filename); + + add_c_tree_codes (); + /* Force the line number back to 0; check_newline will have raised it to 1, which will make the builtin functions appear not to be built in. */ lineno = 0; - c_common_lang_init (); - /* If gen_declaration desired, open the output file. */ if (flag_gen_declaration) { @@ -595,10 +600,11 @@ objc_init () generate_struct_by_value_array (); objc_act_parse_init (); - c_parse_init (); VARRAY_TREE_INIT (deferred_fns, 32, "deferred_fns"); ggc_add_tree_varray_root (&deferred_fns, 1); + + return filename; } /* Register a function tree, so that its optimization and conversion |