Use some of gnulib's new modules, taken from coreutils.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index 8c94618395439ce704ef28854ff262980fb35de7..43985965c4c41e893889c9731d04775e57d0969b 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,5 +1,7 @@
-/* Input parser for bison
-   Copyright (C) 2000, 2001, 2002  Free Software Foundation, Inc.
+/* Input parser for Bison
+
+   Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -15,27 +17,54 @@
 
    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 READER_H_
 # define READER_H_
 
-#include "symtab.h"
+# include "location.h"
+# include "symlist.h"
+
+# include "parse-gram.h"
+
+typedef struct merger_list
+{
+  struct merger_list* next;
+  uniqstr name;
+  uniqstr type;
+  location type_declaration_location;
+} merger_list;
+
+/* From the parser.  */
+extern int gram_debug;
+int gram_parse (void);
+char const *token_name (int type);
+
 
-/* Read in the grammar specification and record it in the format
-   described in gram.h.  */
+/* From reader.c. */
+void grammar_start_symbol_set (symbol *sym, location loc);
+void prologue_augment (const char *prologue, location loc, bool post);
+void grammar_current_rule_begin (symbol *lhs, location loc);
+void grammar_current_rule_end (location loc);
+void grammar_midrule_action (void);
+void grammar_current_rule_prec_set (symbol *precsym, location loc);
+void grammar_current_rule_dprec_set (int dprec, location loc);
+void grammar_current_rule_merge_set (uniqstr name, location loc);
+void grammar_current_rule_symbol_append (symbol *sym, location loc);
+void grammar_current_rule_action_append (const char *action, location loc);
+void reader (void);
+void free_merger_functions (void);
 
-void reader PARAMS ((void));
+extern merger_list *merge_functions;
 
-/* Free the packed grammar. */
-void grammar_free PARAMS ((void));
+/* Was %union seen?  */
+extern bool union_seen;
 
-extern int lineno;
+/* Was a tag seen?  */
+extern bool tag_seen;
 
-extern symbol_t *errtoken;
-extern symbol_t *undeftoken;
-extern symbol_t *eoftoken;
-extern symbol_t *axiom;
+/* Should rules have a default precedence?  */
+extern bool default_prec;
 
 #endif /* !READER_H_ */