* src/Makefile.am (LDADD): Link $(LIBINTL) last to avoid the

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index 17c300574882706f9ec258e74bd4f21f15ed014f..26d159052b47abc4da32c6fc69692fcabe4850a6 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, 2002 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 "struniq.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,28 +48,22 @@ 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;
-

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

-/* The verbose output. */
-extern struct obstack output_obstack;
-
-extern char *infile;
+/* 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 struniq_t grammar_file;

 
 

-void compute_output_file_names PARAMS((void));
+/* The current file name.  Might change with %include, or with #line.  */
+extern struniq_t current_file;

 
 

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

 
 

-/* Compute the double inclusion guard's name. */
-char *compute_header_macro PARAMS ((void));
-
-const char *skeleton_find PARAMS ((const char *envvar,
-                                  const char *skeleton_name));
+FILE *xfopen (const char *name, const char *mode);
+void xfclose (FILE *ptr);

 
 /* Is SUFFIX ending STRING?  */
 int strsuffix (const char* string, const char* suffix);
 
 /* Is SUFFIX ending STRING?  */
 int strsuffix (const char* string, const char* suffix);


@@ -79,8 +75,4 @@ char* stringappend (const char* string1, const char* string2);
 /* Prefix used to generate output file names.  */
 extern char *short_base_name;
 
 /* Prefix used to generate output file names.  */
 extern char *short_base_name;
 

-/* Infix used to generate output file names (i.e., `.tab', or `_tab',
-   or `').  */
-extern char *output_infix;
-

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