X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4502eadc2fbdd6efe2e4702cb3993cac83a59615..9b33de72cd2469bedac2b5f0a48a8782571ea9db:/src/files.c diff --git a/src/files.c b/src/files.c index 934e1143..06334f8b 100644 --- a/src/files.c +++ b/src/files.c @@ -1,7 +1,7 @@ /* Open and close files for Bison. Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. + 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -35,9 +35,6 @@ #include "getargs.h" #include "gram.h" -struct obstack pre_prologue_obstack; -struct obstack post_prologue_obstack; - /* Initializing some values below (such SPEC_NAME_PREFIX to `yy') is tempting, but don't do that: for the time being our handling of the %directive vs --option leaves precedence to the options by deciding @@ -53,6 +50,10 @@ char *spec_graph_file = NULL; /* for -g. */ char *spec_defines_file = NULL; /* for --defines. */ char *parser_file_name; +/* All computed output file names. */ +static char **file_names = NULL; +static int file_names_count = 0; + uniqstr grammar_file = NULL; uniqstr current_file = NULL; @@ -72,7 +73,7 @@ uniqstr current_file = NULL; empty string (meaning the current directory); otherwise it is `dir/'. */ -static char *all_but_ext; +char *all_but_ext; static char *all_but_tab_ext; char *dir_prefix; @@ -149,12 +150,20 @@ tr (char *s, char from, char to) static void compute_exts_from_gf (const char *ext) { - src_extension = xstrdup (ext); - header_extension = xstrdup (ext); - tr (src_extension, 'y', 'c'); - tr (src_extension, 'Y', 'C'); - tr (header_extension, 'y', 'h'); - tr (header_extension, 'Y', 'H'); + if (strcmp (ext, ".y") == 0) + { + src_extension = xstrdup (language->src_extension); + header_extension = xstrdup (language->header_extension); + } + else + { + src_extension = xstrdup (ext); + header_extension = xstrdup (ext); + tr (src_extension, 'y', 'c'); + tr (src_extension, 'Y', 'C'); + tr (header_extension, 'y', 'h'); + tr (header_extension, 'Y', 'H'); + } } /* Compute extensions from the given c source file extension. */ @@ -277,7 +286,10 @@ compute_file_name_parts (void) xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0))); } - all_but_ext = concat2 (all_but_tab_ext, TAB_EXT); + if (language->add_tab) + all_but_ext = concat2 (all_but_tab_ext, TAB_EXT); + else + all_but_ext = xstrdup (all_but_tab_ext); /* Compute the extensions from the grammar file name. */ if (ext && !yacc_flag) @@ -292,11 +304,6 @@ compute_file_name_parts (void) void compute_output_file_names (void) { - char const *name[4]; - int i; - int j; - int names = 0; - compute_file_name_parts (); /* If not yet done. */ @@ -305,7 +312,7 @@ compute_output_file_names (void) if (!header_extension) header_extension = xstrdup (".h"); - name[names++] = parser_file_name = + parser_file_name = (spec_outfile ? xstrdup (spec_outfile) : concat2 (all_but_ext, src_extension)); @@ -314,39 +321,52 @@ compute_output_file_names (void) { if (! spec_defines_file) spec_defines_file = concat2 (all_but_ext, header_extension); - name[names++] = spec_defines_file; } if (graph_flag) { if (! spec_graph_file) spec_graph_file = concat2 (all_but_tab_ext, ".dot"); - name[names++] = spec_graph_file; + output_file_name_check (spec_graph_file); } if (report_flag) { spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT); - name[names++] = spec_verbose_file; + output_file_name_check (spec_verbose_file); } - for (j = 0; j < names; j++) - for (i = 0; i < j; i++) - if (strcmp (name[i], name[j]) == 0) - warn (_("conflicting outputs to file %s"), quote (name[i])); - - free (all_but_ext); free (all_but_tab_ext); free (src_extension); free (header_extension); } +void +output_file_name_check (char const *file_name) +{ + { + int i; + for (i = 0; i < file_names_count; i++) + if (0 == strcmp (file_names[i], file_name)) + warn (_("conflicting outputs to file %s"), quote (file_name)); + } + file_names = xnrealloc (file_names, ++file_names_count, sizeof *file_names); + file_names[file_names_count-1] = xstrdup (file_name); +} + void output_file_names_free (void) { + free (all_but_ext); free (spec_verbose_file); free (spec_graph_file); free (spec_defines_file); free (parser_file_name); free (dir_prefix); + { + int i; + for (i = 0; i < file_names_count; i++) + free (file_names[i]); + } + free (file_names); }