Regen.

[bison.git] / src / state.h

diff --git a/src/state.h b/src/state.h
index c2282474c6f3845cae0b6d23d9864df4b83a7437..95b716d89c3e10f2be650d6db6e9f5568cd373dc 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -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;