Various DJGGP specific issues in /djgpp.

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index 4b162ee86a103b8015741be6fe808818e65f9f9d..ba9fec2f2eb2c0ed1209594409e73dbc00fa53fa 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -15,60 +15,54 @@
 
    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.  */

 
 #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.  */
 /* File name specified with -o for the output file, or 0 if no -o.  */

-extern char *spec_outfile;
+extern char const *spec_outfile;

 
 /* File name for the parser (i.e., the one above, or its default.) */
 
 /* File name for the parser (i.e., the one above, or its default.) */

-extern char *parser_file_name;
+extern char const *parser_file_name;

 
 /* Symbol prefix specified with -p, or 0 if no -p.  */
 extern const char *spec_name_prefix;
 
 /* File name prefix specified with -b, or 0 if no -b.  */
 
 /* Symbol prefix specified with -p, or 0 if no -p.  */
 extern const char *spec_name_prefix;
 
 /* File name prefix specified with -b, or 0 if no -b.  */

-extern char *spec_file_prefix;
+extern char const *spec_file_prefix;

 
 /* --verbose. */
 
 /* --verbose. */

-extern char *spec_verbose_file;
+extern char const *spec_verbose_file;

 
 /* File name specified for the output VCG graph.  */
 
 /* File name specified for the output VCG graph.  */

-extern char *spec_graph_file;
+extern char const *spec_graph_file;

 
 /* File name specified with --defines.  */
 
 /* File name specified with --defines.  */

-extern char *spec_defines_file;
+extern char const *spec_defines_file;

 
 

-/* Read grammar specifications. */
-extern FILE *finput;
+/* Directory prefix of output file names.  */
+extern char const *dir_prefix;

 
 
 /* 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;
 

-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 uniqstr grammar_file;
+
+/* The current file name.  Might change with %include, or with #line.  */
+extern uniqstr current_file;

 
 void compute_output_file_names (void);
 
 FILE *xfopen (const char *name, const char *mode);
 
 void compute_output_file_names (void);
 
 FILE *xfopen (const char *name, const char *mode);

-int xfclose (FILE *ptr);
-
-/* Is SUFFIX ending STRING?  */
-int strsuffix (const char* string, const char* suffix);
-
-/* Return a newly allocated string composed of the concatenation of
-   STRING1, and STRING2.  */
-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;
+void xfclose (FILE *ptr);

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