]> git.saurik.com Git - bison.git/commit - src/conflicts.h
* src/state.h (state_t): `solved_conflicts' is a new member.
authorAkim Demaille <akim@epita.fr>
Sun, 26 May 2002 20:25:52 +0000 (20:25 +0000)
committerAkim Demaille <akim@epita.fr>
Sun, 26 May 2002 20:25:52 +0000 (20:25 +0000)
commitb408954b40e74d85ee90544ea7e296dbc99356c9
treeb88990420d41ad341f5541f070308f1d9eb73fe9
parenta49aecd528ab271f49fa76a482abbd84ce216b46
* 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.
12 files changed:
ChangeLog
NEWS
TODO
src/LR0.c
src/conflicts.c
src/conflicts.h
src/getargs.c
src/getargs.h
src/main.c
src/print.c
src/state.h
tests/conflicts.at