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

cex: style: prefer FOO_print to print_FOO

Browse Source 
* src/state-item.h, src/state-item.c (print_state_item): Rename as...
(state_item_print): this.
* src/counterexample.c (print_counterexample): Rename as...
(counterexample_print): this.
This commit is contained in:
Akim Demaille
2020-07-28 19:46:41 +02:00
parent be95a4fe29
commit ece343d2c2
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/counterexample.c
View File

@@ -119,7 +119,7 @@ static int max (int a, int b)
} }
static void static void
print_counterexample (const counterexample *cex, FILE *out, const char *prefix) counterexample_print (const counterexample *cex, FILE *out, const char *prefix)
{ {
const bool flat = getenv ("YYFLAT"); const bool flat = getenv ("YYFLAT");
const char *example1_label const char *example1_label
@@ -526,7 +526,7 @@ nonunifying_shift_path (state_item_list reduce_path, state_item *shift_conflict)
for (gl_list_iterator_t it = gl_list_iterator (result); for (gl_list_iterator_t it = gl_list_iterator (result);
state_item_list_next (&it, &sip); state_item_list_next (&it, &sip);
) )
print_state_item (sip, stderr, ""); state_item_print (sip, stderr, "");
} }
return result; return result;
} }
@@ -1267,7 +1267,7 @@ counterexample_report (state_item_number itm1, state_item_number itm2,
: example_from_path (shift_reduce, itm2, shortest_path, next_sym); : example_from_path (shift_reduce, itm2, shortest_path, next_sym);
gl_list_free (shortest_path); gl_list_free (shortest_path);
print_counterexample (cex, out, prefix); counterexample_print (cex, out, prefix);
free_counterexample (cex); free_counterexample (cex);
} }
@@ -1290,8 +1290,8 @@ counterexample_report_shift_reduce (state_item_number itm1, state_item_number it
// In the report, print the items. // In the report, print the items.
if (out != stderr || trace_flag & trace_cex) if (out != stderr || trace_flag & trace_cex)
{ {
print_state_item (&state_items[itm1], out, prefix); state_item_print (&state_items[itm1], out, prefix);
print_state_item (&state_items[itm2], out, prefix); state_item_print (&state_items[itm2], out, prefix);
} }
counterexample_report (itm1, itm2, next_sym, true, out, prefix); counterexample_report (itm1, itm2, next_sym, true, out, prefix);
} }
@@ -1334,8 +1334,8 @@ counterexample_report_reduce_reduce (state_item_number itm1, state_item_number i
// In the report, print the items. // In the report, print the items.
if (out != stderr || trace_flag & trace_cex) if (out != stderr || trace_flag & trace_cex)
{ {
print_state_item (&state_items[itm1], out, prefix); state_item_print (&state_items[itm1], out, prefix);
print_state_item (&state_items[itm2], out, prefix); state_item_print (&state_items[itm2], out, prefix);
} }
counterexample_report (itm1, itm2, bitset_first (conflict_syms), counterexample_report (itm1, itm2, bitset_first (conflict_syms),
false, out, prefix); false, out, prefix);

2
src/lssi.c
View File

@@ -256,7 +256,7 @@ shortest_path_from_start (state_item_number target, symbol_number next_sym)
gl_list_iterator_t it = gl_list_iterator (res); gl_list_iterator_t it = gl_list_iterator (res);
const void *sip; const void *sip;
while (gl_list_iterator_next (&it, &sip, NULL)) while (gl_list_iterator_next (&it, &sip, NULL))
print_state_item ((state_item *) sip, stdout, ""); state_item_print ((state_item *) sip, stdout, "");
} }
return res; return res;
} }

4
src/parse-simulation.c
View File

@@ -594,8 +594,8 @@ print_parse_state (parse_state *ps)
FILE *out = stderr; FILE *out = stderr;
fprintf (out, "(size %zu depth %d rc %d)\n", fprintf (out, "(size %zu depth %d rc %d)\n",
ps->state_items.total_size, ps->depth, ps->reference_count); ps->state_items.total_size, ps->depth, ps->reference_count);
print_state_item (ps->state_items.head_elt, out, ""); state_item_print (ps->state_items.head_elt, out, "");
print_state_item (ps->state_items.tail_elt, out, ""); state_item_print (ps->state_items.tail_elt, out, "");
if (ps->derivs.total_size > 0) if (ps->derivs.total_size > 0)
derivation_print (ps->derivs.head_elt, out, ""); derivation_print (ps->derivs.head_elt, out, "");
putc ('\n', out); putc ('\n', out);

6
src/state-item.c
View File

@@ -475,7 +475,7 @@ prune_disabled_paths (void)
} }
void void
print_state_item (const state_item *si, FILE *out, const char *prefix) state_item_print (const state_item *si, FILE *out, const char *prefix)
{ {
fputs (prefix, out); fputs (prefix, out);
item_print (si->item, NULL, out); item_print (si->item, NULL, out);
@@ -506,7 +506,7 @@ state_items_report (void)
if (si->trans >= 0) if (si->trans >= 0)
{ {
fputs (" -> ", stdout); fputs (" -> ", stdout);
print_state_item (&state_items[si->trans], stdout, ""); state_item_print (&state_items[si->trans], stdout, "");
} }
bitset sets[2] = { si->prods, si->revs }; bitset sets[2] = { si->prods, si->revs };
@@ -521,7 +521,7 @@ state_items_report (void)
BITSET_FOR_EACH (biter, b, sin, 0) BITSET_FOR_EACH (biter, b, sin, 0)
{ {
fputs (txt[seti], stdout); fputs (txt[seti], stdout);
print_state_item (&state_items[sin], stdout, ""); state_item_print (&state_items[sin], stdout, "");
} }
} }
} }

3
src/state-item.h
View File

@@ -90,9 +90,10 @@ state_item_index_lookup (state_number s, state_item_number off)
} }
void state_items_init (void); void state_items_init (void);
void print_state_item (const state_item *si, FILE *out, const char *prefix);
void state_items_free (void); void state_items_free (void);
void state_item_print (const state_item *si, FILE *out, const char *prefix);
bool production_allowed (const state_item *si, const state_item *next); bool production_allowed (const state_item *si, const state_item *next);
// Iterating on a state_item_list. // Iterating on a state_item_list.