Regen.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index b5b0ae3d18d7d8222939b9697c621f73b389a083..8792372e12b518408e453dd96ac31acefe5dc141 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -24,6 +24,14 @@
 # include "symlist.h"
 # include "parse-gram.h"
 
+typedef struct merger_list
+{
+  struct merger_list* next;
+  const char* name;
+  const char* type;
+}
+merger_list;
+
 typedef struct gram_control_s
 {
   int errcode;
@@ -44,11 +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);
 
-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));
@@ -58,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_t *current_rule;
 void reader PARAMS ((void));
+void free_merger_functions PARAMS ((void));
+
+extern merger_list *merge_functions;
+
+extern int typed;
 
 #endif /* !READER_H_ */