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

cex: send traces to stderr, not stdout

Browse Source 
When comparing traces from different machines, the mixture of
stdout/stderr in the output are making things uselessly difficult.

* src/lssi.c, src/state-item.c: Output debug traces on stderr.
This commit is contained in:
Akim Demaille
2021-01-13 08:01:02 +01:00
parent 983364d76a
commit 430ca0fc63
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lssi.c
View File

@@ -102,15 +102,16 @@ append_lssi (lssi *sn, Hash_table *visited, lssi_list queue)
static void static void
lssi_print (lssi *l) lssi_print (lssi *l)
{ {
print_state_item (&state_items[l->si], stdout); FILE *out = stderr;
print_state_item (&state_items[l->si], out);
if (l->lookahead) if (l->lookahead)
{ {
printf ("FOLLOWL = { "); fprintf (out, "FOLLOWL = { ");
bitset_iterator biter; bitset_iterator biter;
symbol_number sin; symbol_number sin;
BITSET_FOR_EACH (biter, l->lookahead, sin, 0) BITSET_FOR_EACH (biter, l->lookahead, sin, 0)
printf ("%s, \n", symbols[sin]->tag); fprintf (out, "%s, \n", symbols[sin]->tag);
puts ("}"); fprintf (out, "}");
} }
} }
#endif #endif
@@ -252,11 +253,11 @@ shortest_path_from_start (state_item_number target, symbol_number next_sym)
if (trace_flag & trace_cex) if (trace_flag & trace_cex)
{ {
puts ("REDUCE ITEM PATH:"); fputs ("REDUCE ITEM PATH:", stderr);
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))
state_item_print ((state_item *) sip, stdout, ""); state_item_print ((state_item *) sip, stderr, "");
} }
return res; return res;
} }

34
src/state-item.c
View File

@@ -492,27 +492,26 @@ state_item_rule (const state_item *si)
* Report the state_item graph * Report the state_item graph
*/ */
static void static void
state_items_report (void) state_items_report (FILE *out)
{ {
printf ("# state items: %zu\n", nstate_items); fprintf (out, "# state items: %zu\n", nstate_items);
for (state_number i = 0; i < nstates; ++i) for (state_number i = 0; i < nstates; ++i)
{ {
printf ("State %d:\n", i); fprintf (out, "State %d:\n", i);
for (state_item_number j = state_item_map[i]; j < state_item_map[i + 1]; ++j) for (state_item_number j = state_item_map[i]; j < state_item_map[i + 1]; ++j)
{ {
state_item *si = &state_items[j]; state_item *si = &state_items[j];
item_print (si->item, NULL, stdout); item_print (si->item, NULL, out);
if (SI_DISABLED (j)) if (SI_DISABLED (j))
{ {
item_print (si->item, NULL, stdout); item_print (si->item, NULL, out);
puts (" DISABLED"); fputs (" DISABLED", out);
continue; continue;
} }
puts ("");
if (si->trans >= 0) if (si->trans >= 0)
{ {
fputs (" -> ", stdout); fputs (" -> ", out);
state_item_print (&state_items[si->trans], stdout, ""); state_item_print (&state_items[si->trans], out, "");
} }
bitset sets[2] = { si->prods, si->revs }; bitset sets[2] = { si->prods, si->revs };
@@ -526,24 +525,23 @@ state_items_report (void)
state_item_number sin; state_item_number sin;
BITSET_FOR_EACH (biter, b, sin, 0) BITSET_FOR_EACH (biter, b, sin, 0)
{ {
fputs (txt[seti], stdout); fputs (txt[seti], out);
state_item_print (&state_items[sin], stdout, ""); state_item_print (&state_items[sin], out, "");
} }
} }
} }
puts ("");
} }
} }
printf ("FIRSTS\n"); fprintf (out, "FIRSTS\n");
for (symbol_number i = ntokens; i < nsyms; ++i) for (symbol_number i = ntokens; i < nsyms; ++i)
{ {
printf (" %s firsts\n", symbols[i]->tag); fprintf (out, " %s firsts\n", symbols[i]->tag);
bitset_iterator iter; bitset_iterator iter;
symbol_number j; symbol_number j;
BITSET_FOR_EACH (iter, FIRSTS (i), j, 0) BITSET_FOR_EACH (iter, FIRSTS (i), j, 0)
printf (" %s\n", symbols[j]->tag); fprintf (out, " %s\n", symbols[j]->tag);
} }
puts ("\n"); fputc ('\n', out);
} }
void void
@@ -558,8 +556,8 @@ state_items_init (void)
prune_disabled_paths (); prune_disabled_paths ();
if (trace_flag & trace_cex) if (trace_flag & trace_cex)
{ {
printf ("init: %f\n", difftime (time (NULL), start)); fprintf (stderr, "init: %f\n", difftime (time (NULL), start));
state_items_report (); state_items_report (stderr);
} }
} }