Update.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index abff0d3828eba3256352e2684e8b28df737ba991..38e988229307b110c7936c22dda187268b6755dd 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -21,24 +21,61 @@
 #ifndef READER_H_
 # define READER_H_
 
-#include "symtab.h"
+# include "symlist.h"
+# include "parse-gram.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.  */
+typedef struct gram_control_s
+{
+  int errcode;
+} gram_control_t;
+
+/* From the scanner.  */
+extern FILE *gram_in;
+extern int gram__flex_debug;
+void scanner_last_string_free PARAMS ((void));
+void scanner_initialize PARAMS ((void));
+void scanner_free PARAMS ((void));
+
+# define YY_DECL \
+  int gram_lex (yystype *yylval, location_t *yylloc, \
+               gram_control_t *yycontrol)
+YY_DECL;
 
-void reader PARAMS ((void));
 
-/* Free the packed grammar. */
-void grammar_free PARAMS ((void));
+/* From the parser.  */
+extern int gram_debug;
+void gram_error (gram_control_t *control,
+                location_t *loc, const char *msg);
+int gram_parse (void *control);
 
-extern int lineno;
+/* The sort of braced code we are in.  */
+typedef enum braced_code_e
+  {
+    action_braced_code,
+    destructor_braced_code,
+    printer_braced_code
+  } braced_code_t;
+/* FIXME: This is really a dirty hack which demonstrates that we
+   should probably not try to parse the actions now.  */
+extern braced_code_t current_braced_code;
 
-extern bucket *errtoken;
-extern bucket *undeftoken;
-extern bucket *eoftoken;
-extern bucket *axiom;
+
+/* From reader.c. */
+void grammar_start_symbol_set PARAMS ((symbol_t *s, location_t l));
+void prologue_augment PARAMS ((const char *prologue, location_t location));
+void epilogue_set PARAMS ((const char *epilogue, location_t location));
+void grammar_symbol_append PARAMS ((symbol_t *s, location_t l));
+void grammar_rule_begin PARAMS ((symbol_t *lhs, location_t l));
+void grammar_rule_end PARAMS ((location_t l));
+void grammar_midrule_action PARAMS ((void));
+void grammar_current_rule_prec_set PARAMS ((symbol_t *precsym,
+                                           location_t l));
+void grammar_current_rule_symbol_append PARAMS ((symbol_t *symbol,
+                                                location_t l));
+void grammar_current_rule_action_append PARAMS ((const char *action,
+                                                location_t l));
+extern symbol_list_t *current_rule;
+void reader PARAMS ((void));
+extern int typed;
 
 #endif /* !READER_H_ */