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

cex: reformat the s/r and r/r reports

Browse Source 
In Bison we refer to "shift/reduce" conflicts, not "shift-reduce" (in
Bison 3.6.3 186 occurrences vs 15).  Enforce consistency on this.

Instead of "spending" a second line for each conflict to report the
lookaheads, put that on the same line as the type of conflict.  Also,
prefer "token" to "symbol".  Maybe we should even prefer "lookahead".
While at it, enable internationalization, with plurals where
appropriate.

As a consequence, instead of

    Shift-Reduce Conflict:
    6:    3 b: . %empty
    6:    6 d: c . A
    On Symbol: A

display

    Shift/reduce conflict on token A:
    6:    3 b: . %empty
    6:    6 d: c . A

* NEWS, doc/bison.texi, src/conflicts.c: Spell it "shift/reduce", not
"shift-reduce".
* src/counterexample.c (counterexample_report_shift_reduce)
(counterexample_report_reduce_reduce): Reformat and internationalize
output.
* tests/counterexample.at: Adjust expectations.
This commit is contained in:
Akim Demaille
2020-06-07 07:32:59 +02:00
parent 421662ec88
commit 1ccb4be02b
6 changed files with 61 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/counterexample.c
View File

@@ -21,6 +21,8 @@
#include "counterexample.h"
#include "system.h"
#include <gl_linked_list.h>
#include <gl_rbtreehash_list.h>
#include <hash.h>
@@ -1214,10 +1216,9 @@ counterexample_report_shift_reduce (state_item_number itm1, state_item_number it
symbol_number next_sym)
{
FILE *out = stderr;
fputs ("Shift-Reduce Conflict:\n", out);
fprintf (out, _("Shift/reduce conflict on token %s:\n"), symbols[next_sym]->tag);
print_state_item (&state_items[itm1], out);
print_state_item (&state_items[itm2], out);
fprintf (out, "On Symbol: %s\n", symbols[next_sym]->tag);
counterexample_report (itm1, itm2, next_sym, true);
}
@@ -1226,18 +1227,21 @@ counterexample_report_reduce_reduce (state_item_number itm1, state_item_number i
bitset conflict_syms)
{
FILE *out = stderr;
fputs ("Reduce-Reduce Conflict:\n", out);
{
fputs (ngettext ("Reduce/reduce conflict on token",
"Reduce/reduce conflict on tokens",
bitset_count (conflict_syms)), out);
bitset_iterator biter;
state_item_number sym;
const char *sep = " ";
BITSET_FOR_EACH (biter, conflict_syms, sym, 0)
{
fprintf (out, "%s%s", sep, symbols[sym]->tag);
sep = ", ";
}
fputs (_(":\n"), out);
}
print_state_item (&state_items[itm1], out);
print_state_item (&state_items[itm2], out);
fputs ("On Symbols: ", out);
bitset_iterator biter;
state_item_number sym;
const char *sep = "";
BITSET_FOR_EACH (biter, conflict_syms, sym, 0)
{
fprintf (out, "%s%s", sep, symbols[sym]->tag);
sep = ", ";
}
fputs ("\n", out);
counterexample_report (itm1, itm2, bitset_first (conflict_syms), false);
}