X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3f7ca628535da8ee4296061580cc9a944bcf4ab4..86649705b4dc7a12e753405a3946ec36ba6a0bb9:/src/files.c diff --git a/src/files.c b/src/files.c index 05985d8e..f698c7e9 100644 --- a/src/files.c +++ b/src/files.c @@ -1,24 +1,22 @@ /* Open and close files for Bison. - Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. - Bison is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Bison is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with Bison; see the file COPYING. If not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include #include "system.h" @@ -27,6 +25,7 @@ #include #include #include +#include #include #include @@ -35,9 +34,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 @@ -50,6 +46,7 @@ char const *spec_file_prefix = NULL; /* for -b. */ char const *spec_name_prefix = NULL; /* for -p. */ char *spec_verbose_file = NULL; /* for --verbose. */ char *spec_graph_file = NULL; /* for -g. */ +char *spec_xml_file = NULL; /* for -x. */ char *spec_defines_file = NULL; /* for --defines. */ char *parser_file_name; @@ -76,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; @@ -113,7 +110,8 @@ xfopen (const char *name, const char *mode) ptr = fopen_safer (name, mode); if (!ptr) - error (EXIT_FAILURE, get_errno (), _("cannot open file `%s'"), name); + error (EXIT_FAILURE, get_errno (), + _("%s: cannot open"), quotearg_colon (name)); return ptr; } @@ -129,7 +127,7 @@ xfclose (FILE *ptr) return; if (ferror (ptr)) - error (EXIT_FAILURE, 0, _("I/O error")); + error (EXIT_FAILURE, 0, _("input/output error")); if (fclose (ptr) != 0) error (EXIT_FAILURE, get_errno (), _("cannot close file")); @@ -140,25 +138,24 @@ xfclose (FILE *ptr) | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. | `------------------------------------------------------------------*/ -/* In the string S, replace all characters FROM by TO. */ -static void -tr (char *s, char from, char to) -{ - for (; *s; s++) - if (*s == from) - *s = to; -} - /* Compute extensions from the grammar file extension. */ 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. */ @@ -210,7 +207,7 @@ file_name_split (const char *file_name, *base = last_component (file_name); /* Look for the extension, i.e., look for the last dot. */ - *ext = strrchr (*base, '.'); + *ext = mbsrchr (*base, '.'); *tab = NULL; /* If there is an extension, check if there is a `.tab' part right @@ -263,7 +260,9 @@ compute_file_name_parts (void) if (spec_file_prefix) { /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = `foo'. */ - dir_prefix = xstrndup (grammar_file, base - grammar_file); + dir_prefix = + xstrndup (spec_file_prefix, + last_component (spec_file_prefix) - spec_file_prefix); all_but_tab_ext = xstrdup (spec_file_prefix); } else if (yacc_flag) @@ -281,7 +280,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) @@ -319,39 +321,69 @@ compute_output_file_names (void) { if (! spec_graph_file) spec_graph_file = concat2 (all_but_tab_ext, ".dot"); - output_file_name_check (spec_graph_file); + output_file_name_check (&spec_graph_file); + } + + if (xml_flag) + { + if (! spec_xml_file) + spec_xml_file = concat2 (all_but_tab_ext, ".xml"); + output_file_name_check (&spec_xml_file); } if (report_flag) { - spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT); - output_file_name_check (spec_verbose_file); + if (!spec_verbose_file) + spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT); + output_file_name_check (&spec_verbose_file); } - free (all_but_ext); free (all_but_tab_ext); free (src_extension); free (header_extension); } void -output_file_name_check (char const *file_name) +output_file_name_check (char **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); + bool conflict = false; + if (0 == strcmp (*file_name, grammar_file)) + { + complain (_("refusing to overwrite the input file %s"), + quote (*file_name)); + conflict = true; + } + else + { + 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)); + conflict = true; + } + } + if (conflict) + { + free (*file_name); + *file_name = strdup ("/dev/null"); + } + else + { + 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_xml_file); free (spec_defines_file); free (parser_file_name); free (dir_prefix);