(_AT_TEST_GLR_CXXTYPES): Do not include <assert.h>.

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index 3d264db2c47ce140772bdc250c7f7f550056dd73..26d159052b47abc4da32c6fc69692fcabe4850a6 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -21,6 +21,8 @@
 #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;
 
@@ -50,7 +52,13 @@ extern FILE *finput;
 extern struct obstack pre_prologue_obstack;
 extern struct obstack post_prologue_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;
+
+/* The current file name.  Might change with %include, or with #line.  */
+extern struniq_t current_file;
 
 void compute_output_file_names (void);
 
@@ -67,8 +75,4 @@ char* stringappend (const char* string1, const char* string2);
 /* 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_ */