X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/280a38c306200177ef15e0f52775312edc057065..b25d88f6d2e2f4b59927aacecdc0a9e44a34b5d9:/src/reader.h?ds=sidebyside

diff --git a/src/reader.h b/src/reader.h
index abff0d38..a32e84f5 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -21,24 +21,72 @@
 #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 merger_list
+{
+  struct merger_list* next;
+  struniq_t name;
+  struniq_t type;
+}
+merger_list;
 
-void reader PARAMS ((void));
+typedef struct gram_control_s
+{
+  int errcode;
+} gram_control_t;
 
-/* Free the packed grammar. */
-void grammar_free PARAMS ((void));
+/* From the scanner.  */
+extern FILE *gram_in;
+extern int gram__flex_debug;
+void scanner_initialize (void);
+void scanner_free (void);
+void scanner_last_string_free (void);
 
-extern int lineno;
+# define YY_DECL \
+  int gram_lex (yystype *yylval, location_t *yylloc, \
+		gram_control_t *yycontrol)
+YY_DECL;
 
-extern bucket *errtoken;
-extern bucket *undeftoken;
-extern bucket *eoftoken;
-extern bucket *axiom;
+
+/* From the parser.  */
+extern int gram_debug;
+void gram_error (location_t *loc, const char *msg);
+int gram_parse (void *control);
+
+/* 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;
+
+
+/* From reader.c. */
+void grammar_start_symbol_set (symbol_t *s, location_t l);
+void prologue_augment (const char *prologue, location_t location);
+void epilogue_augment (const char *epilogue, location_t location);
+void grammar_symbol_append (symbol_t *s, location_t l);
+void grammar_rule_begin (symbol_t *lhs, location_t l);
+void grammar_rule_end (location_t l);
+void grammar_midrule_action (void);
+void grammar_current_rule_prec_set (symbol_t *precsym, location_t l);
+void grammar_current_rule_dprec_set (int dprec, location_t l);
+void grammar_current_rule_merge_set (struniq_t name, location_t l);
+
+void grammar_current_rule_symbol_append (symbol_t *symbol, location_t l);
+void grammar_current_rule_action_append (const char *action, location_t l);
+extern symbol_list_t *current_rule;
+void reader (void);
+void free_merger_functions (void);
+
+extern merger_list *merge_functions;
+
+extern int typed;
 
 #endif /* !READER_H_ */