Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-13 22:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Akim Demaille
2002-05-26 20:25:52 +00:00
parent a49aecd528
commit b408954b40
12 changed files with 159 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/conflicts.at
View File

@@ -136,7 +136,7 @@ AT_DATA([input.y],
exp: exp OP exp | NUM;
]])
AT_CHECK([bison input.y -o input.c -v], 0, [],
AT_CHECK([bison input.y -o input.c --report=all], 0, [],
[input.y contains 1 shift/reduce conflict.
])
@@ -172,6 +172,8 @@ exp (6)
state 0
$axiom -> . exp $ (rule 0)
exp -> . exp OP exp (rule 1)
exp -> . NUM (rule 2)
NUM shift, and go to state 1
@@ -206,7 +208,9 @@ state 3
state 4
exp -> . exp OP exp (rule 1)
exp -> exp OP . exp (rule 1)
exp -> . NUM (rule 2)
NUM shift, and go to state 1
@@ -216,8 +220,8 @@ state 4
state 5
exp -> exp . OP exp (rule 1)
exp -> exp OP exp . (rule 1)
exp -> exp . OP exp [$, OP] (rule 1)
exp -> exp OP exp . [$, OP] (rule 1)
OP shift, and go to state 4
@@ -244,14 +248,11 @@ AT_DATA([input.y],
exp: exp OP exp | NUM;
]])
AT_CHECK([bison input.y -o input.c -v], 0, [], [])
AT_CHECK([bison input.y -o input.c --report=all], 0, [], [])
# Check the contents of the report.
AT_CHECK([cat input.output], [],
[[Conflict in state 5 between rule 2 and token OP resolved as shift.
Grammar
[[Grammar
Number, Line, Rule
0 4 $axiom -> exp $
@@ -278,6 +279,8 @@ exp (6)
state 0
$axiom -> . exp $ (rule 0)
exp -> . exp OP exp (rule 1)
exp -> . NUM (rule 2)
NUM shift, and go to state 1
@@ -312,7 +315,9 @@ state 3
state 4
exp -> . exp OP exp (rule 1)
exp -> exp OP . exp (rule 1)
exp -> . NUM (rule 2)
NUM shift, and go to state 1
@@ -322,13 +327,14 @@ state 4
state 5
exp -> exp . OP exp (rule 1)
exp -> exp OP exp . (rule 1)
exp -> exp . OP exp [$] (rule 1)
exp -> exp OP exp . [$] (rule 1)
OP shift, and go to state 4
$default reduce using rule 1 (exp)
Conflict between rule 2 and token OP resolved as reduce (%right OP).
]])