* data/yacc.c: (b4_lex_param): Corrected for the case where

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index 301086355d7eb375bb8e9865130c4d3c9fc53aca..bf7e2c77335fb0701c039501c65554e2ba7c066f 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -1,5 +1,5 @@
 /* File names and variables for bison,
 /* 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -21,16 +21,18 @@
 #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.  */
 extern char *spec_outfile;
 
 /* File name for the parser (i.e., the one above, or its default.) */
 extern char *parser_file_name;
 
 /* 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;
 
 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. */
 extern char *spec_file_prefix;
 
 /* --verbose. */


@@ -46,33 +48,24 @@ extern char *spec_defines_file;
 extern FILE *finput;
 
 
 extern FILE *finput;
 
 

-/* Output all the action code; precise form depends on which parser. */
-extern struct obstack action_obstack;
-
-/* 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;
+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 open_files PARAMS((void));
-void close_files PARAMS((void));
+void compute_output_file_names (void);

 
 

-void compute_output_file_names PARAMS((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_ */