X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8efe435c059af57671105fd8671ba97bb8474264..f7aed660541ed7b05c4d892334dfe64ba200a4a2:/src/reader.h

diff --git a/src/reader.h b/src/reader.h
index 70740409..8792372e 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -21,22 +21,16 @@
 #ifndef READER_H_
 # define READER_H_
 
-# include "location.h"
+# include "symlist.h"
+# include "parse-gram.h"
 
-typedef struct symbol_list
+typedef struct merger_list
 {
-  struct symbol_list *next;
-  symbol_t *sym;
-  location_t location;
-
-  /* The action is attached to the LHS of a rule. */
-  const char *action;
-  location_t action_location;
-
-  symbol_t *ruleprec;
-} symbol_list;
-
-# include "parse-gram.h"
+  struct merger_list* next;
+  const char* name;
+  const char* type;
+}
+merger_list;
 
 typedef struct gram_control_s
 {
@@ -58,12 +52,20 @@ YY_DECL;
 
 /* From the parser.  */
 extern int gram_debug;
-void gram_error (gram_control_t *control,
-		 location_t *loc, const char *msg);
+void gram_error (location_t *loc, const char *msg);
 int gram_parse (void *control);
 
-char *get_type_name PARAMS ((int n, symbol_list *rule));
-extern int typed;
+/* 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 PARAMS ((symbol_t *s, location_t l));
@@ -73,12 +75,23 @@ 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));
+void grammar_current_rule_prec_set PARAMS ((symbol_t *precsym,
+					    location_t l));
+void grammar_current_rule_dprec_set PARAMS ((int dprec,
+					    location_t l));
+void grammar_current_rule_merge_set PARAMS ((const char* name,
+					    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 *current_rule;
+extern symbol_list_t *current_rule;
 void reader PARAMS ((void));
+void free_merger_functions PARAMS ((void));
+
+extern merger_list *merge_functions;
+
+extern int typed;
 
 #endif /* !READER_H_ */