c++: variants: don't leak the lookahead in error recovery

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index ecb31738f9534c8a51518cbdf53088d4f82455a2..3c913b6bfc6ff298c216fe7804b9a3f4fa62d71f 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1,24 +1,22 @@
 /* Open and close files for Bison.
 
 /* 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-2015 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    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
 
    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 <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"


@@ -27,6 +25,7 @@
 #include <dirname.h>
 #include <get-errno.h>
 #include <quote.h>
 #include <dirname.h>
 #include <get-errno.h>
 #include <quote.h>

+#include <quotearg.h>

 #include <stdio-safer.h>
 #include <xstrndup.h>
 
 #include <stdio-safer.h>
 #include <xstrndup.h>
 


@@ -35,10 +34,7 @@
 #include "getargs.h"
 #include "gram.h"
 
 #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
+/* 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
    that if a %directive sets a variable which is really set (i.e., not
    tempting, but don't do that: for the time being our handling of the
    %directive vs --option leaves precedence to the options by deciding
    that if a %directive sets a variable which is really set (i.e., not


@@ -48,38 +44,52 @@ struct obstack post_prologue_obstack;
 char const *spec_outfile = NULL;       /* for -o. */
 char const *spec_file_prefix = NULL;   /* for -b. */
 char const *spec_name_prefix = NULL;   /* for -p. */
 char const *spec_outfile = NULL;       /* for -o. */
 char const *spec_file_prefix = NULL;   /* for -b. */
 char const *spec_name_prefix = NULL;   /* for -p. */

-char const *spec_verbose_file = NULL;  /* for --verbose. */
-char const *spec_graph_file = NULL;    /* for -g. */
-char const *spec_defines_file = NULL;  /* for --defines. */
-char const *parser_file_name;
+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;
+
+/* All computed output file names.  */
+typedef struct generated_file
+{
+  /** File name.  */
+  char *name;
+  /** Whether is a generated source file (e.g., *.c, *.java...), as
+      opposed to the report file (e.g., *.output).  When late errors
+      are detected, generated source files are removed.  */
+  bool is_source;
+} generated_file;
+static generated_file *generated_files = NULL;
+static int generated_files_size = 0;

 
 uniqstr grammar_file = NULL;
 uniqstr current_file = NULL;
 
 /* If --output=dir/foo.c was specified,
 
 uniqstr grammar_file = NULL;
 uniqstr current_file = NULL;
 
 /* If --output=dir/foo.c was specified,

-   DIR_PREFIX is `dir/' and ALL_BUT_EXT and ALL_BUT_TAB_EXT are `dir/foo'.
+   DIR_PREFIX is 'dir/' and ALL_BUT_EXT and ALL_BUT_TAB_EXT are 'dir/foo'.

 
 

-   If --output=dir/foo.tab.c was specified, DIR_PREFIX is `dir/',
-   ALL_BUT_EXT is `dir/foo.tab', and ALL_BUT_TAB_EXT is `dir/foo'.
+   If --output=dir/foo.tab.c was specified, DIR_PREFIX is 'dir/',
+   ALL_BUT_EXT is 'dir/foo.tab', and ALL_BUT_TAB_EXT is 'dir/foo'.

 
    If --output was not specified but --file-prefix=dir/foo was specified,
 
    If --output was not specified but --file-prefix=dir/foo was specified,

-   ALL_BUT_EXT = `foo.tab' and ALL_BUT_TAB_EXT = `foo'.
+   ALL_BUT_EXT = 'foo.tab' and ALL_BUT_TAB_EXT = 'foo'.

 
    If neither --output nor --file was specified but the input grammar
 
    If neither --output nor --file was specified but the input grammar

-   is name dir/foo.y, ALL_BUT_EXT and ALL_BUT_TAB_EXT are `foo'.
+   is name dir/foo.y, ALL_BUT_EXT and ALL_BUT_TAB_EXT are 'foo'.

 
    If neither --output nor --file was specified, DIR_PREFIX is the
    empty string (meaning the current directory); otherwise it is
 
    If neither --output nor --file was specified, DIR_PREFIX is the
    empty string (meaning the current directory); otherwise it is

-   `dir/'.  */
+   'dir/'.  */

 
 

-static char const *all_but_ext;
-static char const *all_but_tab_ext;
-char const *dir_prefix;
+char *all_but_ext;
+static char *all_but_tab_ext;
+char *dir_prefix;

 
 /* C source file extension (the parser source).  */
 
 /* C source file extension (the parser source).  */

-static char const *src_extension = NULL;
-/* Header file extension (if option ``-d'' is specified).  */
-static char const *header_extension = NULL;
+static char *src_extension = NULL;
+/* Header file extension (if option '`-d'' is specified).  */
+static char *header_extension = NULL;

 \f
 /*-----------------------------------------------------------------.
 | Return a newly allocated string composed of the concatenation of |
 \f
 /*-----------------------------------------------------------------.
 | Return a newly allocated string composed of the concatenation of |


@@ -109,7 +119,8 @@ xfopen (const char *name, const char *mode)
 
   ptr = fopen_safer (name, mode);
   if (!ptr)
 
   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;
 }
 
   return ptr;
 }


@@ -125,42 +136,47 @@ xfclose (FILE *ptr)
     return;
 
   if (ferror (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"));
 }
 \f
 
 
   if (fclose (ptr) != 0)
     error (EXIT_FAILURE, get_errno (), _("cannot close file"));
 }
 \f
 

+FILE *
+xfdopen (int fd, char const *mode)
+{
+  FILE *res = fdopen (fd, mode);
+  if (! res)
+    error (EXIT_FAILURE, get_errno (),
+           /* On a separate line to please the "unmarked_diagnostics"
+              syntax-check. */
+           "fdopen");
+  return res;
+}
+

 /*------------------------------------------------------------------.
 | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. |
 `------------------------------------------------------------------*/
 
 /*------------------------------------------------------------------.
 | Compute ALL_BUT_EXT, ALL_BUT_TAB_EXT and output files extensions. |
 `------------------------------------------------------------------*/
 

-/* Replace all characters FROM by TO in the string IN.
-   and returns a new allocated string.  */
-static char *
-tr (const char *in, char from, char to)
-{
-  char *temp;
-  char *out = xmalloc (strlen (in) + 1);
-
-  for (temp = out; *in; in++, out++)
-    if (*in == from)
-      *out = to;
-    else
-      *out = *in;
-  *out = 0;
-  return (temp);
-}
-

 /* Compute extensions from the grammar file extension.  */
 static void
 compute_exts_from_gf (const char *ext)
 {
 /* Compute extensions from the grammar file extension.  */
 static void
 compute_exts_from_gf (const char *ext)
 {

-  src_extension = tr (ext, 'y', 'c');
-  src_extension = tr (src_extension, 'Y', 'C');
-  header_extension = tr (ext, 'y', 'h');
-  header_extension = tr (header_extension, 'Y', 'H');
+  if (STREQ (ext, ".y"))
+    {
+      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.  */
 }
 
 /* Compute extensions from the given c source file extension.  */


@@ -171,8 +187,9 @@ compute_exts_from_src (const char *ext)
      so the extenions must be computed unconditionally from the file name
      given by this option.  */
   src_extension = xstrdup (ext);
      so the extenions must be computed unconditionally from the file name
      given by this option.  */
   src_extension = xstrdup (ext);

-  header_extension = tr (ext, 'c', 'h');
-  header_extension = tr (header_extension, 'C', 'H');
+  header_extension = xstrdup (ext);
+  tr (header_extension, 'c', 'h');
+  tr (header_extension, 'C', 'H');

 }
 
 
 }
 
 


@@ -183,7 +200,7 @@ compute_exts_from_src (const char *ext)
    *EXT points to the last period in the basename, or NULL if none.
 
    If there is no *EXT, *TAB is NULL.  Otherwise, *TAB points to
    *EXT points to the last period in the basename, or NULL if none.
 
    If there is no *EXT, *TAB is NULL.  Otherwise, *TAB points to

-   `.tab' or `_tab' if present right before *EXT, or is NULL. *TAB
+   '.tab' or '_tab' if present right before *EXT, or is NULL. *TAB

    cannot be equal to *BASE.
 
    None are allocated, they are simply pointers to parts of FILE_NAME.
    cannot be equal to *BASE.
 
    None are allocated, they are simply pointers to parts of FILE_NAME.


@@ -206,7 +223,7 @@ compute_exts_from_src (const char *ext)
 
 static void
 file_name_split (const char *file_name,
 
 static void
 file_name_split (const char *file_name,

-                const char **base, const char **tab, const char **ext)
+                 const char **base, const char **tab, const char **ext)

 {
   *base = last_component (file_name);
 
 {
   *base = last_component (file_name);
 


@@ -214,16 +231,15 @@ file_name_split (const char *file_name,
   *ext = strrchr (*base, '.');
   *tab = NULL;
 
   *ext = strrchr (*base, '.');
   *tab = NULL;
 

-  /* If there is an extension, check if there is a `.tab' part right
+  /* If there is an extension, check if there is a '.tab' part right

      before.  */
   if (*ext)
     {
       size_t baselen = *ext - *base;
      before.  */
   if (*ext)
     {
       size_t baselen = *ext - *base;

-      size_t dottablen = 4;
+      size_t dottablen = sizeof (TAB_EXT) - 1;

       if (dottablen < baselen
       if (dottablen < baselen

-         && (strncmp (*ext - dottablen, ".tab", dottablen) == 0
-             || strncmp (*ext - dottablen, "_tab", dottablen) == 0))
-       *tab = *ext - dottablen;
+          && STRPREFIX_LIT (TAB_EXT, *ext - dottablen))
+        *tab = *ext - dottablen;

     }
 }
 
     }
 }
 


@@ -245,48 +261,53 @@ compute_file_name_parts (void)
 
       /* ALL_BUT_EXT goes up the EXT, excluding it. */
       all_but_ext =
 
       /* ALL_BUT_EXT goes up the EXT, excluding it. */
       all_but_ext =

-       xstrndup (spec_outfile,
-                 (strlen (spec_outfile) - (ext ? strlen (ext) : 0)));
+        xstrndup (spec_outfile,
+                  (strlen (spec_outfile) - (ext ? strlen (ext) : 0)));

 
       /* ALL_BUT_TAB_EXT goes up to TAB, excluding it.  */
       all_but_tab_ext =
 
       /* ALL_BUT_TAB_EXT goes up to TAB, excluding it.  */
       all_but_tab_ext =

-       xstrndup (spec_outfile,
-                 (strlen (spec_outfile)
-                  - (tab ? strlen (tab) : (ext ? strlen (ext) : 0))));
+        xstrndup (spec_outfile,
+                  (strlen (spec_outfile)
+                   - (tab ? strlen (tab) : (ext ? strlen (ext) : 0))));

 
       if (ext)
 
       if (ext)

-       compute_exts_from_src (ext);
+        compute_exts_from_src (ext);

     }
   else
     {
       file_name_split (grammar_file, &base, &tab, &ext);
 
       if (spec_file_prefix)
     }
   else
     {
       file_name_split (grammar_file, &base, &tab, &ext);
 
       if (spec_file_prefix)

-       {
-         /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = `foo'.  */
-         dir_prefix = xstrndup (grammar_file, base - grammar_file);
-         all_but_tab_ext = xstrdup (spec_file_prefix);
-       }
+        {
+          /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = 'foo'.  */
+          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)
       else if (yacc_flag)

-       {
-         /* If --yacc, then the output is `y.tab.c'.  */
-         dir_prefix = "";
-         all_but_tab_ext = "y";
-       }
+        {
+          /* If --yacc, then the output is 'y.tab.c'.  */
+          dir_prefix = xstrdup ("");
+          all_but_tab_ext = xstrdup ("y");
+        }

       else
       else

-       {
-         /* Otherwise, ALL_BUT_TAB_EXT is computed from the input
-            grammar: `foo/bar.yy' => `bar'.  */
-         dir_prefix = "";
-         all_but_tab_ext =
-           xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0)));
-       }
-
-      all_but_ext = concat2 (all_but_tab_ext, TAB_EXT);
+        {
+          /* Otherwise, ALL_BUT_TAB_EXT is computed from the input
+             grammar: 'foo/bar.yy' => 'bar'.  */
+          dir_prefix = xstrdup ("");
+          all_but_tab_ext =
+            xstrndup (base, (strlen (base) - (ext ? strlen (ext) : 0)));
+        }
+
+      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)
 
       /* Compute the extensions from the grammar file name.  */
       if (ext && !yacc_flag)

-       compute_exts_from_gf (ext);
+        compute_exts_from_gf (ext);

     }
 }
 
     }
 }
 


@@ -297,44 +318,110 @@ compute_file_name_parts (void)
 void
 compute_output_file_names (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. */
   if (!src_extension)
   compute_file_name_parts ();
 
   /* If not yet done. */
   if (!src_extension)

-    src_extension = ".c";
+    src_extension = xstrdup (".c");

   if (!header_extension)
   if (!header_extension)

-    header_extension = ".h";
+    header_extension = xstrdup (".h");

 
 

-  name[names++] = parser_file_name =
-    spec_outfile ? spec_outfile : concat2 (all_but_ext, src_extension);
+  parser_file_name =
+    (spec_outfile
+     ? xstrdup (spec_outfile)
+     : concat2 (all_but_ext, src_extension));

 
   if (defines_flag)
     {
       if (! spec_defines_file)
 
   if (defines_flag)
     {
       if (! spec_defines_file)

-       spec_defines_file = concat2 (all_but_ext, header_extension);
-      name[names++] = spec_defines_file;
+        spec_defines_file = concat2 (all_but_ext, header_extension);

     }
 
   if (graph_flag)
     {
       if (! spec_graph_file)
     }
 
   if (graph_flag)
     {
       if (! spec_graph_file)

-       spec_graph_file = concat2 (all_but_tab_ext, ".dot");
-      name[names++] = spec_graph_file;
+        spec_graph_file = concat2 (all_but_tab_ext, ".dot");
+      output_file_name_check (&spec_graph_file, false);
+    }
+
+  if (xml_flag)
+    {
+      if (! spec_xml_file)
+        spec_xml_file = concat2 (all_but_tab_ext, ".xml");
+      output_file_name_check (&spec_xml_file, false);

     }
 
   if (report_flag)
     {
     }
 
   if (report_flag)
     {

-      spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT);
-      name[names++] = spec_verbose_file;
+      if (!spec_verbose_file)
+        spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT);
+      output_file_name_check (&spec_verbose_file, false);

     }
 
     }
 

-  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_tab_ext);
+  free (src_extension);
+  free (header_extension);
+}
+
+void
+output_file_name_check (char **file_name, bool source)
+{
+  bool conflict = false;
+  if (STREQ (*file_name, grammar_file))
+    {
+      complain (NULL, complaint, _("refusing to overwrite the input file %s"),
+                quote (*file_name));
+      conflict = true;
+    }
+  else
+    {
+      int i;
+      for (i = 0; i < generated_files_size; i++)
+        if (STREQ (generated_files[i].name, *file_name))
+          {
+            complain (NULL, Wother, _("conflicting outputs to file %s"),
+                      quote (generated_files[i].name));
+            conflict = true;
+          }
+    }
+  if (conflict)
+    {
+      free (*file_name);
+      *file_name = strdup ("/dev/null");
+    }
+  else
+    {
+      generated_files = xnrealloc (generated_files, ++generated_files_size,
+                                   sizeof *generated_files);
+      generated_files[generated_files_size-1].name = xstrdup (*file_name);
+      generated_files[generated_files_size-1].is_source = source;
+    }
+}
+
+void
+unlink_generated_sources (void)
+{
+  int i;
+  for (i = 0; i < generated_files_size; i++)
+    if (generated_files[i].is_source)
+      /* Ignore errors.  The file might not even exist.  */
+      unlink (generated_files[i].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);
+  {
+    int i;
+    for (i = 0; i < generated_files_size; i++)
+      free (generated_files[i].name);
+  }
+  free (generated_files);

 }
 }