#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;
-
-symbol_list *symbol_list_new PARAMS ((symbol_t *sym, location_t location));
-symbol_list *symbol_list_prepend PARAMS ((symbol_list *list,
- symbol_t *sym, location_t location));
-
-# include "parse-gram.h"
+ struct merger_list* next;
+ const char* name;
+ const char* type;
+}
+merger_list;
typedef struct gram_control_s
{
/* 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));
+void scanner_last_string_free (void);
+void scanner_initialize (void);
+void scanner_free (void);
# define YY_DECL \
int gram_lex (yystype *yylval, location_t *yylloc, \
/* 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));
-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));
-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;
-void reader PARAMS ((void));
+void grammar_start_symbol_set (symbol_t *s, location_t l);
+void prologue_augment (const char *prologue, location_t location);
+void epilogue_set (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 (const char* 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_ */