* src/scan-gram.l (YY_INIT, YY_GROW, YY_FINISH): Rename as...

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index 92378c701a6dad66237df6dd10b7bd386df4002b..95b716d89c3e10f2be650d6db6e9f5568cd373dc 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -171,7 +171,7 @@ typedef struct state_s
   struct state_s *link;
 
   short number;
-  token_number_t accessing_symbol;
+  symbol_number_t accessing_symbol;
   shifts     *shifts;
   reductions *reductions;
   errs       *errs;
@@ -184,7 +184,12 @@ typedef struct state_s
   short lookaheadsp;
   int nlookaheads;
 
-  /* Its items. */
+  /* If some conflicts were solved thanks to precedence/associativity,
+     a human readable description of the resolution.  */
+  const char *solved_conflicts;
+
+  /* Its items.  Must be last, since ITEMS can be arbitrarily large.
+     */
   unsigned short nitems;
   item_number_t items[1];
 } state_t;