qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move the state clearing into InitData.

Browse source 
Now, for each compilation, or before linking, only InitData needs to be
called. Fixes the double chaining internal error when compiling and linking
in the same command.
This commit is contained in:
Bill Currie 2012-11-09 13:56:45 +09:00
parent f307c7bebc
commit 9fd8741b4f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/qfcc/source/qfcc.c
View file

@ -167,6 +167,13 @@ InitData (void)
pr.entity_data = defspace_new (); pr.entity_data = defspace_new ();
pr.entity_fields = new_symtab (0, stab_global); pr.entity_fields = new_symtab (0, stab_global);
pr.entity_fields->space = pr.entity_data;; pr.entity_fields->space = pr.entity_data;;
clear_functions ();
clear_frame_macros ();
clear_classes ();
clear_immediates ();
clear_selectors ();
chain_initial_types ();
} }
static int static int
@ -350,12 +357,6 @@ compile_to_obj (const char *file, const char *obj, lang_t lang)
return !options.preprocess_only; return !options.preprocess_only;
InitData (); InitData ();
clear_functions ();
clear_frame_macros ();
clear_classes ();
clear_immediates ();
clear_selectors ();
chain_initial_types ();
begin_compilation (); begin_compilation ();
pr.source_file = ReuseString (strip_path (file)); pr.source_file = ReuseString (strip_path (file));
err = yyparse () || pr.error_count; err = yyparse () || pr.error_count;
@ -501,7 +502,7 @@ separate_compile (void)
} }
} }
if (!err && !options.compile) { if (!err && !options.compile) {
chain_initial_types (); InitData ();
linker_begin (); linker_begin ();
for (file = source_files; *file; file++) { for (file = source_files; *file; file++) {
if (strncmp (*file, "-l", 2)) { if (strncmp (*file, "-l", 2)) {
@ -668,7 +669,6 @@ progs_src_compile (void)
setup_sym_file (options.output_file); setup_sym_file (options.output_file);
InitData (); InitData ();
chain_initial_types ();
begin_compilation (); begin_compilation ();