maint: prepare forthcoming changes

* src/gram.c (rule_rhs_print): Do not print new line anymore.
(rule_print): Make it static.
* src/closure.c, src/derives.c, src/gram.c: Adjust.
This commit is contained in:
Akim Demaille
2012-06-29 15:58:59 +02:00
parent 5ff5cf6700
commit 3e153163c7
4 changed files with 8 additions and 7 deletions

View File

@@ -103,6 +103,7 @@ print_fderives (void)
{ {
fprintf (stderr, "\t\t%3d ", r); fprintf (stderr, "\t\t%3d ", r);
rule_rhs_print (&rules[r], stderr); rule_rhs_print (&rules[r], stderr);
fprintf (stderr, "\n");
} }
} }
fprintf (stderr, "\n\n"); fprintf (stderr, "\n\n");

View File

@@ -52,6 +52,7 @@ print_derives (void)
{ {
fprintf (stderr, "\t\t%3d ", (*rp)->user_number); fprintf (stderr, "\t\t%3d ", (*rp)->user_number);
rule_rhs_print (*rp, stderr); rule_rhs_print (*rp, stderr);
fprintf (stderr, "\n");
} }
} }

View File

@@ -105,11 +105,10 @@ rule_rhs_print (rule *r, FILE *out)
item_number *rp; item_number *rp;
for (rp = r->rhs; *rp >= 0; rp++) for (rp = r->rhs; *rp >= 0; rp++)
fprintf (out, " %s", symbols[*rp]->tag); fprintf (out, " %s", symbols[*rp]->tag);
fputc ('\n', out);
} }
else else
{ {
fprintf (out, " /* %s */\n", _("empty")); fprintf (out, " /* %s */", _("empty"));
} }
} }
@@ -133,7 +132,7 @@ rule_rhs_print_xml (rule *r, FILE *out, int level)
} }
} }
void static void
rule_print (rule *r, FILE *out) rule_print (rule *r, FILE *out)
{ {
fprintf (out, "%s:", r->lhs->tag); fprintf (out, "%s:", r->lhs->tag);
@@ -189,6 +188,7 @@ grammar_rules_partial_print (FILE *out, const char *title,
first = false; first = false;
rule_lhs_print (&rules[r], previous_lhs, out); rule_lhs_print (&rules[r], previous_lhs, out);
rule_rhs_print (&rules[r], out); rule_rhs_print (&rules[r], out);
fprintf (out, "\n");
previous_lhs = rules[r].lhs; previous_lhs = rules[r].lhs;
} }
if (!first) if (!first)
@@ -296,6 +296,7 @@ grammar_dump (FILE *out, const char *title)
{ {
fprintf (out, "%-5d ", r); fprintf (out, "%-5d ", r);
rule_print (&rules[r], out); rule_print (&rules[r], out);
fprintf (out, "\n");
} }
} }
fprintf (out, "\n\n"); fprintf (out, "\n\n");
@@ -313,9 +314,10 @@ grammar_rules_useless_report (const char *message)
{ {
complain_at (rules[r].location, w, "%s: ", message); complain_at (rules[r].location, w, "%s: ", message);
rule_print (&rules[r], stderr); rule_print (&rules[r], stderr);
fprintf (stderr, "\n");
fflush (stderr); fflush (stderr);
} }
} }
} }
void void

View File

@@ -229,9 +229,6 @@ size_t rule_rhs_length (rule *r);
/* Print this rule's RHS on OUT. */ /* Print this rule's RHS on OUT. */
void rule_rhs_print (rule *r, FILE *out); void rule_rhs_print (rule *r, FILE *out);
/* Print this rule on OUT. */
void rule_print (rule *r, FILE *out);