More changes to pacify C++ compilers.

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index 573ea3ce54cc812dafcf2b36c776b59b56144f3e..3269c40d417ba5e4f47091dc4b337b8ab12414b6 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -1,5 +1,5 @@
 /* File names and variables for bison,
-   Copyright 1984, 1989, 2000, 2001 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.
 
@@ -15,22 +15,24 @@
 
    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.  */
 
 #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 for the parser (i.e., the one above, or its default.) */
 extern char *parser_file_name;
 
-/* For -a. */
+/* 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;
 
 /* --verbose. */
@@ -46,30 +48,24 @@ extern char *spec_defines_file;
 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;
-
-/* ... and output yyguard, containing all the guard code. */
-extern struct obstack guard_obstack;
+extern struct obstack pre_prologue_obstack;
+extern struct obstack post_prologue_obstack;
 
-/* The verbose output. */
-extern struct obstack output_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;
 
-extern char *infile;
-extern char *attrsfile;
+/* The current file name.  Might change with %include, or with #line.  */
+extern uniqstr current_file;
 
-void compute_output_file_names PARAMS((void));
-void output_files PARAMS((void));
+void compute_output_file_names (void);
 
-FILE *xfopen PARAMS ((const char *name, const char *mode));
-int xfclose PARAMS ((FILE *ptr));
+FILE *xfopen (const char *name, const char *mode);
+void xfclose (FILE *ptr);
 
-/* Compute the double inclusion guard's name. */
-char * compute_header_macro PARAMS ((void));
+/* 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_ */