More changes to pacify C++ compilers.

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index 3c1b2f064a79fe73f873394083520bfefedbc66a..3269c40d417ba5e4f47091dc4b337b8ab12414b6 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -1,7 +1,5 @@
-#ifndef FILES_H_
-# define FILES_H_

 /* File names and variables for bison,
 /* File names and variables for bison,

-   Copyright 1984, 1989, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -17,61 +15,57 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 

-/* These two should be pathnames for opening the sample parser files.
-   When bison is installed, they should be absolute pathnames.
-   XPFILE1 and XPFILE2 normally come from config.h.  */
+#ifndef FILES_H_
+# define FILES_H_
+
+# include "uniqstr.h"

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

-/* For -a. */
-extern char *spec_name_prefix;
+/* File name for the parser (i.e., the one above, or its default.) */
+extern char *parser_file_name;
+
+/* Symbol prefix specified with -p, or 0 if no -p.  */
+extern const char *spec_name_prefix;

 
 

-/* File name pfx specified with -b, or 0 if no -b.  */
+/* File name prefix specified with -b, or 0 if no -b.  */

 extern char *spec_file_prefix;
 
 extern char *spec_file_prefix;
 

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

 
 

-/* Read grammar specifications. */
-extern FILE *finput;
+/* File name specified for the output VCG graph.  */
+extern char *spec_graph_file;

 
 

-/* Output all the action code; precise form depends on which parser. */
-extern struct obstack action_obstack;
+/* File name specified with --defines.  */
+extern char *spec_defines_file;

 
 

-/* Output the tables and the parser and also contains all the %{
-   ... %} definitions.  */
-extern struct obstack table_obstack;
+/* Read grammar specifications. */
+extern FILE *finput;

 
 

-/* optionally output #define's for token numbers. */
-extern struct obstack defines_obstack;

 
 /* If semantic parser, output a .h file that defines YYSTYPE... */
 
 /* If semantic parser, output a .h file that defines YYSTYPE... */

-extern struct obstack attrs_obstack;
-
-/* ... and output yyguard, containing all the guard code. */
-extern struct obstack guard_obstack;
-
-/* The verbose output. */
-extern struct obstack output_obstack;
-
-/* The VCG graph output. */
-extern struct obstack graph_obstack;
+extern struct obstack pre_prologue_obstack;
+extern struct obstack post_prologue_obstack;

 
 

-extern char *infile;
-extern char *attrsfile;
+/* 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;

 
 

-extern const char *src_extension;
-extern const char *header_extension;
+/* The current file name.  Might change with %include, or with #line.  */
+extern uniqstr current_file;

 
 

-void open_files PARAMS((void));
+void compute_output_file_names (void);

 
 

-void output_files PARAMS((void));
+FILE *xfopen (const char *name, const char *mode);
+void xfclose (FILE *ptr);

 
 

-FILE *xfopen PARAMS ((const char *name, const char *mode));
-int xfclose PARAMS ((FILE *ptr));
+/* Prefix used to generate output file names.  */
+extern char *short_base_name;

 
 

-const char *skeleton_find PARAMS ((const char *envvar,
-                                  const char *skeleton_name));

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