* src/state.h (state_t): `solved_conflicts' is a new member.

* src/LR0.c (new_state): Set it to 0.
* src/conflicts.h, src/conflicts.c (print_conflicts)
(free_conflicts, solve_conflicts): Rename as...
(conflicts_print, conflicts_free, conflicts_solve): these.
Adjust callers.
* src/conflicts.c (enum conflict_resolution_e)
(solved_conflicts_obstack): New, used by...
(log_resolution): this.
Adjust to attach the conflict resolution to each state.
Complete the description with the precedence/associativity
information.
(resolve_sr_conflict): Adjust.
* src/print.c (print_state): Output its solved_conflicts.
* tests/conflicts.at (Unresolved SR Conflicts)
(Solved SR Conflicts): Exercise --report=all.

src/getargs.c

@@ -55,6 +55,7 @@ static const char * const report_args[] =
   "state", "states",
   "itemset", "itemsets",
   "lookahead", "lookaheads",
+  "solved",
   "all",
   0
 };
@@ -65,6 +66,7 @@ static const int report_types[] =
   report_states, report_states,
   report_states | report_itemsets, report_states | report_itemsets,
   report_states | report_lookaheads, report_states | report_lookaheads,
+  report_states | report_solved_conflicts,
   report_all
 };
 
@@ -140,6 +142,7 @@ THINGS is a list of comma separated words that can include:\n\
   `state'        describe the states\n\
   `itemset'      complete the core item sets with their closure\n\
   `lookahead'    explicitly associate lookaheads to items\n\
+  `solved'       describe shift/reduce conflicts solving\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\
 "), stream);