style: reduce scopes, propagate const

* src/conflicts.c (conflicts_output): here.
This commit is contained in:
Akim Demaille
2019-06-11 20:46:40 +02:00
parent a298a6d82b
commit 1105cf841b

View File

@@ -431,7 +431,7 @@ conflicts_update_state_numbers (state_number old_to_new[],
`---------------------------------------------*/ `---------------------------------------------*/
static size_t static size_t
count_state_sr_conflicts (state *s) count_state_sr_conflicts (const state *s)
{ {
transitions *trans = s->transitions; transitions *trans = s->transitions;
reductions *reds = s->reductions; reductions *reds = s->reductions;
@@ -479,7 +479,7 @@ count_sr_conflicts (void)
`-----------------------------------------------------------------*/ `-----------------------------------------------------------------*/
static size_t static size_t
count_state_rr_conflicts (state *s) count_state_rr_conflicts (const state *s)
{ {
reductions *reds = s->reductions; reductions *reds = s->reductions;
size_t res = 0; size_t res = 0;
@@ -591,10 +591,9 @@ conflicts_output (FILE *out)
{ {
bool printed_sth = false; bool printed_sth = false;
for (state_number i = 0; i < nstates; ++i) for (state_number i = 0; i < nstates; ++i)
{
state *s = states[i];
if (conflicts[i]) if (conflicts[i])
{ {
const state *s = states[i];
int src = count_state_sr_conflicts (s); int src = count_state_sr_conflicts (s);
int rrc = count_state_rr_conflicts (s); int rrc = count_state_rr_conflicts (s);
fprintf (out, _("State %d "), i); fprintf (out, _("State %d "), i);
@@ -608,7 +607,6 @@ conflicts_output (FILE *out)
fprintf (out, _("conflicts: %d reduce/reduce\n"), rrc); fprintf (out, _("conflicts: %d reduce/reduce\n"), rrc);
printed_sth = true; printed_sth = true;
} }
}
if (printed_sth) if (printed_sth)
fputs ("\n\n", out); fputs ("\n\n", out);
} }