* tests/actions.at (Actions after errors): New test case.

[bison.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index c241344f72a9234fd624cc101283b88fdaf9aa74..a32e84f55aa9400fb96890d65fb38ec3bf61af7c 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -27,8 +27,8 @@
 typedef struct merger_list
 {
   struct merger_list* next;
-  const char* name;
-  const char* type;
+  struniq_t name;
+  struniq_t type;
 }
 merger_list;
 
@@ -42,6 +42,7 @@ extern FILE *gram_in;
 extern int gram__flex_debug;
 void scanner_initialize (void);
 void scanner_free (void);
+void scanner_last_string_free (void);
 
 # define YY_DECL \
   int gram_lex (yystype *yylval, location_t *yylloc, \
@@ -69,14 +70,14 @@ 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_set (const char *epilogue, 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 (const char* name, 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);