More changes to pacify C++ compilers.

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index c0d4a362101c8cf936c3cd971c7f7046ca44aef7..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,64 +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_

 
 

-#define PFILE  XPFILE          /* Simple parser */
-#define PFILE1 XPFILE1         /* Semantic parser */
+# 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, from getargs.c */
-extern char *spec_name_prefix;
-
-/* File name pfx specified with -b, or 0 if no -b.  */
-extern char *spec_file_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;

 
 

-/* Read grammar specifications. */
-extern FILE *finput;
+/* File name prefix specified with -b, or 0 if no -b.  */
+extern char *spec_file_prefix;

 
 

-/* Optionally output messages describing the actions taken. */
-extern FILE *foutput;
+/* --verbose. */
+extern char *spec_verbose_file;

 
 

-/* If semantic parser, output yyguard, containing all the guard code. */
-extern FILE *fguard;
+/* File name specified for the output VCG graph.  */
+extern char *spec_graph_file;

 
 

-/* Read the parser to copy into TABLE_OBSTACK. */
-extern FILE *fparser;
+/* File name specified with --defines.  */
+extern char *spec_defines_file;

 
 

+/* Read grammar specifications. */
+extern FILE *finput;

 
 

-/* Output all the action code; precise form depends on which parser. */
-extern struct obstack action_obstack;

 
 

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

 
 

-/* Output the tables and the parser and also contains all the %{
-   ... %} definitions.  */
-extern struct obstack table_obstack;
+/* 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;

 
 

-/* optionally output #define's for token numbers. */
-extern struct obstack defines_obstack;
+/* The current file name.  Might change with %include, or with #line.  */
+extern uniqstr current_file;

 
 

+void compute_output_file_names (void);

 
 

-extern char *infile;
-extern int lineno;
-extern char *outfile;
-extern char *defsfile;
-extern char *tabfile;
-extern char *attrsfile;
-extern char *guardfile;
-extern char *actfile;
+FILE *xfopen (const char *name, const char *mode);
+void xfclose (FILE *ptr);

 
 

-void open_files PARAMS((void));
-void open_extra_files PARAMS((void));
+/* Prefix used to generate output file names.  */
+extern char *short_base_name;

 
 

-void done PARAMS((void));

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