java: fixes

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index e8df14e7db5e3a97bd2d3469e201621cfe1d123a..8f0bec04ac7e403bb2d9ab88f4ac960f64675216 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -1,24 +1,22 @@
 /* File names and variables for bison,
 
 /* File names and variables for bison,
 

-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2006 Free Software
-   Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2012 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
+   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
    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.
+   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,
+   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
    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 <http://www.gnu.org/licenses/>.  */

 
 #ifndef FILES_H_
 # define FILES_H_
 
 #ifndef FILES_H_
 # define FILES_H_


@@ -29,7 +27,7 @@
 extern char const *spec_outfile;
 
 /* File name for the parser (i.e., the one above, or its default.) */
 extern char const *spec_outfile;
 
 /* File name for the parser (i.e., the one above, or its default.) */

-extern char const *parser_file_name;
+extern char *parser_file_name;

 
 /* Symbol prefix specified with -p, or 0 if no -p.  */
 extern const char *spec_name_prefix;
 
 /* Symbol prefix specified with -p, or 0 if no -p.  */
 extern const char *spec_name_prefix;


@@ -38,21 +36,19 @@ extern const char *spec_name_prefix;
 extern char const *spec_file_prefix;
 
 /* --verbose. */
 extern char const *spec_file_prefix;
 
 /* --verbose. */

-extern char const *spec_verbose_file;
+extern char *spec_verbose_file;

 
 /* File name specified for the output graph.  */
 
 /* File name specified for the output graph.  */

-extern char const *spec_graph_file;
+extern char *spec_graph_file;
+
+/* File name specified for the xml output.  */
+extern char *spec_xml_file;

 
 /* File name specified with --defines.  */
 
 /* File name specified with --defines.  */

-extern char const *spec_defines_file;
+extern char *spec_defines_file;

 
 /* Directory prefix of output file names.  */
 
 /* Directory prefix of output file names.  */

-extern char const *dir_prefix;
-
-
-/* If semantic parser, output a .h file that defines YYSTYPE... */
-extern struct obstack pre_prologue_obstack;
-extern struct obstack post_prologue_obstack;
+extern char *dir_prefix;

 
 /* The file name as given on the command line.
    Not named "input_file" because Flex uses this name for an argument,
 
 /* The file name as given on the command line.
    Not named "input_file" because Flex uses this name for an argument,


@@ -62,7 +58,12 @@ extern uniqstr grammar_file;
 /* The current file name.  Might change with %include, or with #line.  */
 extern uniqstr current_file;
 
 /* The current file name.  Might change with %include, or with #line.  */
 extern uniqstr current_file;
 

+/* The computed base for output file names.  */
+extern char *all_but_ext;
+

 void compute_output_file_names (void);
 void compute_output_file_names (void);

+void output_file_names_free (void);
+void output_file_name_check (char **file_name);

 
 FILE *xfopen (const char *name, const char *mode);
 void xfclose (FILE *ptr);
 
 FILE *xfopen (const char *name, const char *mode);
 void xfclose (FILE *ptr);