c++: fix several issues with locations

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index a6cbfa2788cb4370b51a521f4d38b55af5e07f2c..ebe5037c7ac277ab3f7e01d2d472f5fc32ad87e5 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -1,28 +1,30 @@
 /* File names and variables for bison,
 /* File names and variables for bison,

-   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1989, 2000-2002, 2006-2007, 2009-2013 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, 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_
 

+# include "uniqstr.h"
+

 /* File name specified with -o for the output file, or 0 if no -o.  */
 /* File name specified with -o for the output file, or 0 if no -o.  */

-extern char *spec_outfile;
+extern char const *spec_outfile;

 
 /* File name for the parser (i.e., the one above, or its default.) */
 extern char *parser_file_name;
 
 /* File name for the parser (i.e., the one above, or its default.) */
 extern char *parser_file_name;


@@ -31,40 +33,40 @@ extern char *parser_file_name;
 extern const char *spec_name_prefix;
 
 /* File name prefix specified with -b, or 0 if no -b.  */
 extern const char *spec_name_prefix;
 
 /* File name prefix specified with -b, or 0 if no -b.  */

-extern char *spec_file_prefix;
+extern char const *spec_file_prefix;

 
 /* --verbose. */
 extern char *spec_verbose_file;
 
 
 /* --verbose. */
 extern char *spec_verbose_file;
 

-/* File name specified for the output VCG graph.  */
+/* File name specified for the output graph.  */

 extern char *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.  */
 extern char *spec_defines_file;
 
 /* File name specified with --defines.  */
 extern char *spec_defines_file;
 

-/* Read grammar specifications. */
-extern FILE *finput;
+/* Directory prefix of output file names.  */
+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,
+   and therefore GCC warns about a name clash. */
+extern uniqstr grammar_file;

 
 

-/* If semantic parser, output a .h file that defines YYSTYPE... */
-extern struct obstack pre_prologue_obstack;
-extern struct obstack post_prologue_obstack;
+/* The current file name.  Might change with %include, or with #line.  */
+extern uniqstr current_file;

 
 

-extern char *infile;
+/* 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);
+FILE *xfopen (const char *name, char const *mode);

 void xfclose (FILE *ptr);
 void xfclose (FILE *ptr);

-
-/* Is SUFFIX ending STRING?  */
-int strsuffix (const char* string, const char* suffix);
-
-/* Return a newly allocated string composed of the concatenation of
-   STRING1, and STRING2.  */
-char* stringappend (const char* string1, const char* string2);
-
-/* Prefix used to generate output file names.  */
-extern char *short_base_name;
+FILE *xfdopen (int fd, char const *mode);

 
 #endif /* !FILES_H_ */
 
 #endif /* !FILES_H_ */