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

graph: minor simplification

Browse Source 
* src/gram.c (print_lhs): Use %*s to indent.
* src/print_graph.c (print_lhs): Use obstack_printf.
Became simple enough to be inlined in...
(print_core): here.
Use a "rule*" instead of an index in "rules[]".
This commit is contained in:
Akim Demaille
2012-12-28 10:04:49 +01:00
parent 510c8497f8
commit fd7f0289bc
2 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gram.c
View File

@@ -69,16 +69,9 @@ rule_lhs_print (rule const *r, symbol const *previous_lhs, FILE *out)
{ {
fprintf (out, " %3d ", r->number); fprintf (out, " %3d ", r->number);
if (previous_lhs != r->lhs) if (previous_lhs != r->lhs)
{ fprintf (out, "%s:", r->lhs->tag);
fprintf (out, "%s:", r->lhs->tag);
}
else else
{ fprintf (out, "%*s|", (int) strlen (previous_lhs->tag), "");
int n;
for (n = strlen (previous_lhs->tag); n > 0; --n)
fputc (' ', out);
fputc ('|', out);
}
} }
void void

50
src/print_graph.c
View File

@@ -42,33 +42,15 @@
/* Print the lhs of a rule in such a manner that there is no vertical /* Print the lhs of a rule in such a manner that there is no vertical
repetition, like in *.output files. */ repetition, like in *.output files. */
static void
print_lhs (struct obstack *oout, rule *previous_rule, rule *r)
{
if (previous_rule && STREQ (previous_rule->lhs->tag, r->lhs->tag))
{
int i;
for (i = 0; i < strlen (r->lhs->tag); ++i)
obstack_1grow (oout, ' ');
obstack_1grow (oout, '|');
}
else
{
obstack_sgrow (oout, escape (r->lhs->tag));
obstack_1grow (oout, ':');
}
obstack_1grow (oout, ' ');
}
static void static void
print_core (struct obstack *oout, state *s) print_core (struct obstack *oout, state *s)
{ {
item_number *sitems = s->items; item_number const *sitems = s->items;
rule *previous_rule = NULL; symbol *previous_lhs = NULL;
size_t i; size_t i;
size_t snritems = s->nitems; size_t snritems = s->nitems;
/* Output all the items of a state, not only its kernel. */ /* Output all the items of a state, not just its kernel. */
if (report_flag & report_itemsets) if (report_flag & report_itemsets)
{ {
closure (sitems, snritems); closure (sitems, snritems);
@@ -80,22 +62,24 @@ print_core (struct obstack *oout, state *s)
obstack_sgrow (oout, "\\n\\l"); obstack_sgrow (oout, "\\n\\l");
for (i = 0; i < snritems; i++) for (i = 0; i < snritems; i++)
{ {
item_number *sp; item_number const *sp1 = ritem + sitems[i];
item_number *sp1; item_number const *sp = sp1;
rule_number r; rule *r;
sp1 = sp = ritem + sitems[i]; while (0 <= *sp)
while (*sp >= 0)
sp++; sp++;
r = item_number_as_rule_number (*sp); r = &rules[item_number_as_rule_number (*sp)];
obstack_printf (oout, "%3d ", r); obstack_printf (oout, "%3d ", r->number);
print_lhs (oout, previous_rule, &rules[r]); if (previous_lhs && UNIQSTR_EQ (previous_lhs->tag, r->lhs->tag))
previous_rule = &rules[r]; obstack_printf (oout, "%*s| ",
(int) strlen (previous_lhs->tag), "");
else
obstack_printf (oout, "%s: ", escape (r->lhs->tag));
previous_lhs = r->lhs;
for (sp = rules[r].rhs; sp < sp1; sp++) for (sp = r->rhs; sp < sp1; sp++)
obstack_printf (oout, "%s ", escape (symbols[*sp]->tag)); obstack_printf (oout, "%s ", escape (symbols[*sp]->tag));
obstack_1grow (oout, '.'); obstack_1grow (oout, '.');
@@ -109,7 +93,7 @@ print_core (struct obstack *oout, state *s)
{ {
/* Find the reduction we are handling. */ /* Find the reduction we are handling. */
reductions *reds = s->reductions; reductions *reds = s->reductions;
int redno = state_reduction_find (s, &rules[r]); int redno = state_reduction_find (s, r);
/* Print them if there are. */ /* Print them if there are. */
if (reds->lookahead_tokens && redno != -1) if (reds->lookahead_tokens && redno != -1)