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/conflicts.c (count_sr_conflicts, count_rr_conflicts): Return

Browse Source 
the result instead of using...
(src_total, rrc_total, src_count, rrc_count): Remove.
(any_conflicts): Remove.
(print_conflicts): Split into...
(conflicts_print, conflicts_output): New.
* src/conflicts.h: Adjust.
* src/main.c (main): Invoke both conflicts_output and conflicts_print.
* src/print.c (print_grammar): Issue `n' between to rule outputs.
* tests/regression.at (Conflicts): New.
Reported by Tom Lane.
This commit is contained in:
Akim Demaille
2001-11-12 09:31:40 +00:00
parent e4d3d4de4c
commit 0df87bb609
7 changed files with 185 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/print.c
View File

@@ -226,7 +226,7 @@ print_grammar (FILE *out)
int column = 0;
/* rule # : LHS -> RHS */
fprintf (out, "\n%s\n", _("Grammar"));
fprintf (out, "\n%s\n\n", _("Grammar"));
for (i = 1; i <= nrules; i++)
/* Don't print rules disabled in reduce_grammar_tables. */
if (rlhs[i] >= 0)
@@ -237,7 +237,8 @@ print_grammar (FILE *out)
while (*rule > 0)
fprintf (out, " %s", tags[*rule++]);
else
fprintf (out, " /* %s */\n", _("empty"));
fprintf (out, " /* %s */", _("empty"));
fputc ('\n', out);
}
/* TERMINAL (type #) : rule #s terminal is on RHS */
@@ -336,8 +337,7 @@ print_results (void)
size_t size = obstack_object_size (&output_obstack);
fwrite (obstack_finish (&output_obstack), 1, size, out);
if (any_conflicts)
print_conflicts (out);
conflicts_output (out);
print_grammar (out);