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

* src/print.c (print_state): Separate the list of solved conflicts

Browse Source 
from the other items.
* tests/conflicts.at (Resolved SR Conflicts): Adjust.
This commit is contained in:
Akim Demaille
2002-10-13 19:35:59 +00:00
parent ea99527d23
commit 7ea9a33f3b
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2002-10-13 Akim Demaille <akim@epita.fr>
* src/print.c (print_state): Separate the list of solved conflicts
from the other items.
* tests/conflicts.at (Resolved SR Conflicts): Adjust.
2002-10-13 Akim Demaille <akim@epita.fr> 2002-10-13 Akim Demaille <akim@epita.fr>
Let nondeterministic skeletons be usable with deterministic Let nondeterministic skeletons be usable with deterministic

5
src/print.c
View File

@@ -422,7 +422,10 @@ print_state (FILE *out, state_t *state)
print_actions (out, state); print_actions (out, state);
if ((report_flag & report_solved_conflicts) if ((report_flag & report_solved_conflicts)
&& state->solved_conflicts) && state->solved_conflicts)
fputs (state->solved_conflicts, out); {
fputc ('\n', out);
fputs (state->solved_conflicts, out);
}
} }
/*-----------------------------------------. /*-----------------------------------------.

1
tests/conflicts.at
View File

@@ -328,6 +328,7 @@ state 5
1 | exp OP exp . [$end, OP] 1 | exp OP exp . [$end, OP]
$default reduce using rule 1 (exp) $default reduce using rule 1 (exp)
Conflict between rule 1 and token OP resolved as reduce (%left OP). Conflict between rule 1 and token OP resolved as reduce (%left OP).
]]) ]])