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

(conflict_report):

Browse Source 
Renamed from conflict_report_yacc, removing the old
'conflict_report'.  Translate the entire conflict report at once,
so that we don't assume that "," has the same interpretation in
all languages.
(conflicts_output): Use Yacc-style conflict report for each state,
instead of our more-complicated style.
(conflicts_print): Use Yacc-style conflict report, except print
the input file name when not emulating Yacc.
This commit is contained in:
Paul Eggert
2002-12-29 01:58:49 +00:00
parent 5a99098d0b
commit be7280480c
1 changed files with 17 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/conflicts.c
View File

@@ -387,60 +387,20 @@ count_rr_conflicts (state *s, int one_per_token)
} }
/*--------------------------------------------------------------. /*--------------------------------------------------------.
| Return a human readable string which reports shift/reduce and | | Report the number of conflicts, using the Yacc format. |
| reduce/reduce conflict numbers (SRC_NUM, RRC_NUM). | `--------------------------------------------------------*/
`--------------------------------------------------------------*/
static const char *
conflict_report (int src_num, int rrc_num)
{
static char res[4096];
char *cp = res;
if (src_num >= 1)
{
sprintf (cp, ngettext ("%d shift/reduce conflict",
"%d shift/reduce conflicts", src_num), src_num);
cp += strlen (cp);
}
if (src_num > 0 && rrc_num > 0)
{
sprintf (cp, " %s ", _("and"));
cp += strlen (cp);
}
if (rrc_num >= 1)
{
sprintf (cp, ngettext ("%d reduce/reduce conflict",
"%d reduce/reduce conflicts", rrc_num), rrc_num);
cp += strlen (cp);
}
*cp++ = '\0';
return res;
}
/*----------------------------------------------------------------.
| Same as above, but report the number of conflicts a` la POSIX. |
`----------------------------------------------------------------*/
static void static void
conflict_report_yacc (int src_num, int rrc_num) conflict_report (FILE *out, int src_num, int rrc_num)
{ {
/* If invoked with `--yacc', use the output format specified by if (src_num && rrc_num)
POSIX. */ fprintf (out, _("conflicts: %d shift/reduce, %d reduce/reduce\n"),
fprintf (stderr, _("conflicts: ")); src_num, rrc_num);
if (src_num > 0) else if (src_num)
fprintf (stderr, _(" %d shift/reduce"), src_num); fprintf (out, _("conflicts: %d shift/reduce\n"), src_num);
if (src_num > 0 && rrc_num > 0) else if (rrc_num)
fprintf (stderr, ","); fprintf (out, _("conflicts: %d reduce/reduce\n"), rrc_num);
if (rrc_num > 0)
fprintf (stderr, _(" %d reduce/reduce"), rrc_num);
putc ('\n', stderr);
} }
@@ -458,10 +418,9 @@ conflicts_output (FILE *out)
state *s = states[i]; state *s = states[i];
if (conflicts[i]) if (conflicts[i])
{ {
fprintf (out, _("State %d contains "), i); fprintf (out, _("State %d "), i);
fprintf (out, "%s.\n", conflict_report (out, count_sr_conflicts (s),
conflict_report (count_sr_conflicts (s), count_rr_conflicts (s, true));
count_rr_conflicts (s, true)));
printed_sth = true; printed_sth = true;
} }
} }
@@ -529,10 +488,9 @@ conflicts_print (void)
return; return;
/* Report the total number of conflicts on STDERR. */ /* Report the total number of conflicts on STDERR. */
if (yacc_flag) if (! yacc_flag)
conflict_report_yacc (src_total, rrc_total); fprintf (stderr, "%s: ", current_file);
else conflict_report (stderr, src_total, rrc_total);
warn ("%s", conflict_report (src_total, rrc_total));
if (expected_conflicts != -1) if (expected_conflicts != -1)
{ {