Don't include c.m4, as "include" doesn't do what we want.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index 7cdd694195b8885f5c921069e5b63c9afe20f409..7a8bb705334b53baa332c3a33bb998ea329ddcb2 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,5 +1,6 @@
-/* Input parser for bison
-   Copyright 2000 Free Software Foundation, Inc.
+/* Input parser for Bison
+
+   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -21,21 +22,56 @@
 #ifndef READER_H_
 # define READER_H_
 
-/* Read in the grammar specification and record it in the format
-   described in gram.h.  All guards are copied into the FGUARD file
-   and all actions into FACTION, in each case forming the body of a C
-   function (YYGUARD or YYACTION) which contains a switch statement to
-   decide which guard or action to execute.  */
+# include "location.h"
+# include "symlist.h"
+
+# include "parse-gram.h"
+
+typedef struct merger_list
+{
+  struct merger_list* next;
+  uniqstr name;
+  uniqstr type;
+} merger_list;
+
+/* From the scanner.  */
+extern FILE *gram_in;
+extern int gram__flex_debug;
+extern boundary scanner_cursor;
+void scanner_initialize (void);
+void scanner_free (void);
+void scanner_last_string_free (void);
+
+# define YY_DECL int gram_lex (yystype *val, location *loc)
+YY_DECL;
+
+
+/* From the parser.  */
+extern int gram_debug;
+int gram_parse (void);
+char const *token_name (int);
 
-extern void reader PARAMS ((void));
 
+/* From reader.c. */
+void grammar_start_symbol_set (symbol *s, location loc);
+void prologue_augment (const char *prologue, location loc);
+void epilogue_augment (const char *epilogue, location loc);
+void grammar_symbol_append (symbol *s, location loc);
+void grammar_rule_begin (symbol *lhs, location loc);
+void grammar_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);
 
-extern void reader_output_yylsp PARAMS ((struct obstack *));
+void grammar_current_rule_symbol_append (symbol *sym, location loc);
+void grammar_current_rule_action_append (const char *action, location loc);
+extern symbol_list *current_rule;
+void reader (void);
+void free_merger_functions (void);
 
-extern int lineno;
-extern char **tags;
-extern short *user_toknums;
+extern merger_list *merge_functions;
 
-extern struct obstack macro_obstack;
+extern int typed;
 
 #endif /* !READER_H_ */