02111-1307, USA. */
#include "system.h"
+#include "complain.h"
#include "getargs.h"
#include "files.h"
#include "gram.h"
#include "reader.h"
#include "LR0.h"
-int any_conflicts = 0;
errs **err_table = NULL;
-int expected_conflicts;
+/* -1 stands for not specified. */
+int expected_conflicts = -1;
static char *conflicts = NULL;
static unsigned *shiftset = NULL;
static unsigned *lookaheadset = NULL;
-static int src_count;
-static int rrc_count;
\f
static inline void
shifts *shiftp;
int k, i;
- shiftp = shift_table[state];
+ shiftp = state_table[state].shift_table;
if (shiftp)
{
for (i = 0; i < k; i++)
{
if (shiftp->shifts[i]
- && token == accessing_symbol[shiftp->shifts[i]])
+ && token == state_table[shiftp->shifts[i]].accessing_symbol)
(shiftp->shifts[i]) = 0;
}
}
for (i = 0; i < tokensetsize; i++)
lookaheadset[i] = 0;
- shiftp = shift_table[state];
+ shiftp = state_table[state].shift_table;
if (shiftp)
{
k = shiftp->nshifts;
for (i = 0; i < k; i++)
{
- symbol = accessing_symbol[shiftp->shifts[i]];
+ symbol = state_table[shiftp->shifts[i]].accessing_symbol;
if (ISVAR (symbol))
break;
SETBIT (lookaheadset, symbol);
fp3 = lookaheadset;
while (fp3 < fp4)
- {
- if (*fp2++ & *fp3++)
- {
- conflicts[state] = 1;
- any_conflicts = 1;
- }
- }
+ if (*fp2++ & *fp3++)
+ conflicts[state] = 1;
fp2 = fp1;
fp3 = lookaheadset;
err_table = XCALLOC (errs *, nstates);
- any_conflicts = 0;
-
for (i = 0; i < nstates; i++)
set_conflicts (i);
}
| Count the number of shift/reduce conflicts. |
`---------------------------------------------*/
-static void
+static int
count_sr_conflicts (int state)
{
int i;
unsigned *fp3;
int symbol;
- src_count = 0;
+ int src_count = 0;
- shiftp = shift_table[state];
+ shiftp = state_table[state].shift_table;
if (!shiftp)
- return;
+ return 0;
for (i = 0; i < tokensetsize; i++)
{
{
if (!shiftp->shifts[i])
continue;
- symbol = accessing_symbol[shiftp->shifts[i]];
+ symbol = state_table[shiftp->shifts[i]].accessing_symbol;
if (ISVAR (symbol))
break;
SETBIT (shiftset, symbol);
fp2++;
}
}
+
+ return src_count;
}
| Count the number of reduce/reduce conflicts. |
`----------------------------------------------*/
-static void
+static int
count_rr_conflicts (int state)
{
int i;
- int j;
- int count;
unsigned mask;
unsigned *baseword;
- unsigned *wordp;
- int m;
- int n;
- rrc_count = 0;
+ int rrc_count = 0;
- m = lookaheads[state];
- n = lookaheads[state + 1];
+ int m = lookaheads[state];
+ int n = lookaheads[state + 1];
if (n - m < 2)
- return;
+ return 0;
mask = 1;
baseword = LA + m * tokensetsize;
for (i = 0; i < ntokens; i++)
{
- wordp = baseword;
+ unsigned *wordp = baseword;
- count = 0;
+ int count = 0;
+ int j;
for (j = m; j < n; j++)
{
if (mask & *wordp)
baseword++;
}
}
+
+ return rrc_count;
}
/*--------------------------------------------------------------.
static char res[4096];
char *cp = res;
- if (src_num == 1)
- {
- sprintf (cp, _(" 1 shift/reduce conflict"));
- cp += strlen (cp);
- }
- else if (src_num > 1)
+ if (src_num >= 1)
{
- sprintf (cp, _(" %d shift/reduce conflicts"), src_num);
+ 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, _(" and"));
+ sprintf (cp, " %s ", _("and"));
cp += strlen (cp);
}
- if (rrc_num == 1)
- {
- sprintf (cp, _(" 1 reduce/reduce conflict"));
- cp += strlen (cp);
- }
- else if (rrc_num > 1)
+ if (rrc_num >= 1)
{
- sprintf (cp, _(" %d reduce/reduce conflicts"), rrc_num);
+ sprintf (cp, ngettext ("%d reduce/reduce conflict",
+ "%d reduce/reduce conflicts", rrc_num), rrc_num);
cp += strlen (cp);
}
}
-/*---------------------------------------------.
-| Compute and give a report on the conflicts. |
-`---------------------------------------------*/
+/*-----------------------------------------------------------.
+| Output the detailed description of states with conflicts. |
+`-----------------------------------------------------------*/
void
-print_conflicts (FILE *out)
+conflicts_output (FILE *out)
{
int i;
- int src_total;
- int rrc_total;
+ for (i = 0; i < nstates; i++)
+ if (conflicts[i])
+ {
+ fprintf (out, _("State %d contains "), i);
+ fputs (conflict_report (count_sr_conflicts (i),
+ count_rr_conflicts (i)), out);
+ }
+}
+
+
+/*------------------------------------------.
+| Reporting the total number of conflicts. |
+`------------------------------------------*/
- src_total = 0;
- rrc_total = 0;
+void
+conflicts_print (void)
+{
+ int i;
- /* Count the total number of conflicts, and if wanted, give a
- detailed report in FOUTPUT. */
+ int src_total = 0;
+ int rrc_total = 0;
+
+ /* Conflicts by state. */
for (i = 0; i < nstates; i++)
+ if (conflicts[i])
+ {
+ src_total += count_sr_conflicts (i);
+ rrc_total += count_rr_conflicts (i);
+ }
+
+ /* Report the total number of conflicts on STDERR. */
+ if (src_total || rrc_total)
{
- if (conflicts[i])
+ if (yacc_flag)
{
- count_sr_conflicts (i);
- count_rr_conflicts (i);
- src_total += src_count;
- rrc_total += rrc_count;
-
- if (verbose_flag)
- {
- fprintf (out, _("State %d contains"), i);
- fputs (conflict_report (src_count, rrc_count), out);
- }
+ /* If invoked with `--yacc', use the output format specified by
+ POSIX. */
+ fprintf (stderr, _("conflicts: "));
+ if (src_total > 0)
+ fprintf (stderr, _(" %d shift/reduce"), src_total);
+ if (src_total > 0 && rrc_total > 0)
+ fprintf (stderr, ",");
+ if (rrc_total > 0)
+ fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
+ putc ('\n', stderr);
+ }
+ else
+ {
+ fprintf (stderr, _("%s contains "), infile);
+ fputs (conflict_report (src_total, rrc_total), stderr);
}
}
- /* Report the total number of conflicts on STDERR. */
- if (yacc_flag)
- {
- /* If invoked with `--yacc', use the output format specified by
- POSIX. */
- fprintf (stderr, _("conflicts: "));
- if (src_total > 0)
- fprintf (stderr, _(" %d shift/reduce"), src_total);
- if (src_total > 0 && rrc_total > 0)
- fprintf (stderr, ",");
- if (rrc_total > 0)
- fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
- putc ('\n', stderr);
- }
- else
+ if (expected_conflicts != -1
+ && src_total != expected_conflicts)
{
- fprintf (stderr, _("%s contains"), infile);
- fputs (conflict_report (src_total, rrc_total), stderr);
+ complain_message_count++;
+ fprintf (stderr, ngettext ("expected %d shift/reduce conflict",
+ "expected %d shift/reduce conflicts",
+ expected_conflicts),
+ expected_conflicts);
}
}
void
-print_reductions (int state)
+print_reductions (FILE *out, int state)
{
int i;
int j;
for (i = 0; i < tokensetsize; i++)
shiftset[i] = 0;
- shiftp = shift_table[state];
+ shiftp = state_table[state].shift_table;
if (shiftp)
{
k = shiftp->nshifts;
{
if (!shiftp->shifts[i])
continue;
- symbol = accessing_symbol[shiftp->shifts[i]];
+ symbol = state_table[shiftp->shifts[i]].accessing_symbol;
if (ISVAR (symbol))
break;
/* if this state has a shift for the error token,
for (i = 0; i < ntokens; i++)
{
if (mask & *fp3)
- obstack_fgrow3 (&output_obstack,
- _(" %-4s\t[reduce using rule %d (%s)]\n"),
- tags[i], default_rule, tags[rlhs[default_rule]]);
+ fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"),
+ tags[i], default_rule, tags[rlhs[default_rule]]);
mask <<= 1;
if (mask == 0)
}
}
- obstack_fgrow2 (&output_obstack,
- _(" $default\treduce using rule %d (%s)\n\n"),
- default_rule, tags[rlhs[default_rule]]);
+ fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"),
+ default_rule, tags[rlhs[default_rule]]);
}
else if (n - m >= 1)
{
{
if (!shiftp->shifts[i])
continue;
- symbol = accessing_symbol[shiftp->shifts[i]];
+ symbol = state_table[shiftp->shifts[i]].accessing_symbol;
if (ISVAR (symbol))
break;
SETBIT (shiftset, symbol);
if (j != default_LA)
{
rule = LAruleno[j];
- obstack_fgrow3 (&output_obstack,
+ fprintf (out,
_(" %-4s\treduce using rule %d (%s)\n"),
tags[i], rule, tags[rlhs[rule]]);
}
if (defaulted)
{
rule = LAruleno[default_LA];
- obstack_fgrow3 (&output_obstack,
+ fprintf (out,
_(" %-4s\treduce using rule %d (%s)\n"),
tags[i], rule, tags[rlhs[rule]]);
defaulted = 0;
}
rule = LAruleno[j];
- obstack_fgrow3 (&output_obstack,
+ fprintf (out,
_(" %-4s\t[reduce using rule %d (%s)]\n"),
tags[i], rule, tags[rlhs[rule]]);
}
}
if (default_LA >= 0)
- obstack_fgrow2 (&output_obstack,
- _(" $default\treduce using rule %d (%s)\n"),
- default_rule, tags[rlhs[default_rule]]);
-
- obstack_1grow (&output_obstack, '\n');
+ fprintf (out, _(" $default\treduce using rule %d (%s)\n"),
+ default_rule, tags[rlhs[default_rule]]);
}
}
projects / bison.git / blobdiff