Agregate yylval and yylloc.

[bison.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 06334f8b118e013092b80b1d3ade10c8ce39912b..07f761b461cb1a6e6fee7f692031b3968ee0f38c 100644 (file)
--- 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,
 /* Open and close files for Bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,

-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008 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"


@@ -47,6 +45,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 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;
 
 char *spec_defines_file = NULL;  /* for --defines. */
 char *parser_file_name;
 


@@ -268,7 +267,9 @@ compute_file_name_parts (void)
       if (spec_file_prefix)
        {
          /* If --file-prefix=foo was specified, ALL_BUT_TAB_EXT = `foo'.  */
       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)
          all_but_tab_ext = xstrdup (spec_file_prefix);
        }
       else if (yacc_flag)


@@ -330,9 +331,17 @@ compute_output_file_names (void)
       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)
     {
   if (report_flag)
     {

-      spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT);
+      if (!spec_verbose_file)
+        spec_verbose_file = concat2 (all_but_tab_ext, OUTPUT_EXT);

       output_file_name_check (spec_verbose_file);
     }
 
       output_file_name_check (spec_verbose_file);
     }
 


@@ -344,6 +353,8 @@ compute_output_file_names (void)
 void
 output_file_name_check (char const *file_name)
 {
 void
 output_file_name_check (char const *file_name)
 {

+  if (0 == strcmp (file_name, grammar_file))
+    fatal (_("refusing to overwrite the input file %s"), quote (file_name));

   {
     int i;
     for (i = 0; i < file_names_count; i++)
   {
     int i;
     for (i = 0; i < file_names_count; i++)


@@ -360,6 +371,7 @@ output_file_names_free (void)
   free (all_but_ext);
   free (spec_verbose_file);
   free (spec_graph_file);
   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);
   free (spec_defines_file);
   free (parser_file_name);
   free (dir_prefix);