* tests/regression.at, tests/torture.at, tests/calc.at: Adjust to

[bison.git] / src / files.h

diff --git a/src/files.h b/src/files.h
index c0d4a362101c8cf936c3cd971c7f7046ca44aef7..f05d935731e101172744b309a9ad73a7cfaf554a 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -1,7 +1,5 @@
-#ifndef FILES_H_
-# define FILES_H_

 /* File names and variables for bison,
 /* File names and variables for bison,

-   Copyright 1984, 1989, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1989, 2000, 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.
 


@@ -20,42 +18,38 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 

+#ifndef FILES_H_
+# define FILES_H_
+

 /* These two should be pathnames for opening the sample parser files.
    When bison is installed, they should be absolute pathnames.
    XPFILE1 and XPFILE2 normally come from config.h.  */
 
 /* These two should be pathnames for opening the sample parser files.
    When bison is installed, they should be absolute pathnames.
    XPFILE1 and XPFILE2 normally come from config.h.  */
 

-#define PFILE  XPFILE          /* Simple parser */
-#define PFILE1 XPFILE1         /* Semantic parser */
-

 /* File name specified with -o for the output file, or 0 if no -o.  */
 extern char *spec_outfile;
 
 /* File name specified with -o for the output file, or 0 if no -o.  */
 extern char *spec_outfile;
 

-/* For -a, from getargs.c */
+/* For -a. */

 extern char *spec_name_prefix;
 
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;
 
 extern char *spec_name_prefix;
 
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;
 

+/* --verbose. */
+extern char *spec_verbose_file;

 
 

-/* Read grammar specifications. */
-extern FILE *finput;
+/* File name specified for the output VCG graph.  */
+extern char *spec_graph_file;

 
 

-/* Optionally output messages describing the actions taken. */
-extern FILE *foutput;
+/* File name specified with --defines.  */
+extern char *spec_defines_file;

 
 

-/* If semantic parser, output yyguard, containing all the guard code. */
-extern FILE *fguard;
-
-/* Read the parser to copy into TABLE_OBSTACK. */
-extern FILE *fparser;
+/* Read grammar specifications. */
+extern FILE *finput;

 
 
 /* Output all the action code; precise form depends on which parser. */
 extern struct obstack action_obstack;
 
 
 
 /* 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;
-

 /* Output the tables and the parser and also contains all the %{
    ... %} definitions.  */
 extern struct obstack table_obstack;
 /* Output the tables and the parser and also contains all the %{
    ... %} definitions.  */
 extern struct obstack table_obstack;


@@ -63,18 +57,30 @@ extern struct obstack table_obstack;
 /* optionally output #define's for token numbers. */
 extern struct obstack defines_obstack;
 
 /* optionally output #define's for token numbers. */
 extern struct obstack defines_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;
+
+/* The verbose output. */
+extern struct obstack output_obstack;

 
 extern char *infile;
 
 extern char *infile;

-extern int lineno;
-extern char *outfile;
-extern char *defsfile;
-extern char *tabfile;

 extern char *attrsfile;
 extern char *attrsfile;

-extern char *guardfile;
-extern char *actfile;

 
 void open_files PARAMS((void));
 
 void open_files PARAMS((void));

-void open_extra_files PARAMS((void));
+void close_files PARAMS((void));
+
+void compute_output_file_names PARAMS((void));
+void output_files PARAMS((void));
+
+FILE *xfopen PARAMS ((const char *name, const char *mode));
+int xfclose PARAMS ((FILE *ptr));
+
+const char *skeleton_find PARAMS ((const char *envvar,
+                                  const char *skeleton_name));
+
+int strsuffix PARAMS ((const char *string, const char *suffix));

 
 

-void done PARAMS((void));

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