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

Display items as we display rules.

Browse Source 
* src/gram.h, src/gram.c (rule_lhs_print): New.
* src/gram.c (grammar_rules_partial_print): Use it.
* src/print.c (print_core): Likewise.
* tests/conflicts.at (Defaulted Conflicted Reduction),
(Unresolved SR Conflicts): Adjust.
(Unresolved SR Conflicts): Adjust and rename as...
(Resolved SR Conflicts): this, as was meant.
* tests/regression.at (Web2c Report): Adjust.
This commit is contained in:
Akim Demaille
2002-06-30 17:33:08 +00:00
parent bc933ef16d
commit ce4ccb4b11
6 changed files with 139 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/gram.c
View File

@@ -47,6 +47,30 @@ int glr_parser = 0;
int pure_parser = 0;
/*----------------------------------------------------------------.
| Print this RULE's number and lhs on OUT. If a PREVIOUS_LHS was |
| already displayed (by a previous call for another rule), avoid |
| useless repetitions. |
`----------------------------------------------------------------*/
void
rule_lhs_print (rule_t *rule, symbol_t *previous_lhs, FILE *out)
{
fprintf (out, " %3d ", rule->number - 1);
if (previous_lhs != rule->lhs)
{
fprintf (out, "%s:", symbol_tag_get (rule->lhs));
}
else
{
int n;
for (n = strlen (symbol_tag_get (previous_lhs)); n > 0; --n)
fputc (' ', out);
fputc ('|', out);
}
}
/*--------------------------------------.
| Return the number of symbols in RHS. |
`--------------------------------------*/
@@ -139,39 +163,22 @@ ritem_longest_rhs (void)
| (exclusive) on OUT under TITLE. |
`----------------------------------------------------------------*/
static inline void
blanks_print (unsigned n, FILE *out)
{
for (/* Nothing*/; n > 0; --n)
fputc (' ', out);
}
void
grammar_rules_partial_print (FILE *out, const char *title,
rule_number_t begin, rule_number_t end)
{
int r;
symbol_t *last_lhs = NULL;
symbol_t *previous_lhs = NULL;
/* rule # : LHS -> RHS */
fprintf (out, "%s\n\n", title);
for (r = begin; r < end; r++)
{
if (last_lhs && last_lhs != rules[r].lhs)
if (previous_lhs && previous_lhs != rules[r].lhs)
fputc ('\n', out);
fprintf (out, " %3d ", r - 1);
if (last_lhs != rules[r].lhs)
{
last_lhs = rules[r].lhs;
fprintf (out, "%s:", symbol_tag_get (last_lhs));
}
else
{
blanks_print (strlen (symbol_tag_get (last_lhs)), out);
fputc ('|', out);
}
rule_lhs_print (&rules[r], previous_lhs, out);
rule_rhs_print (&rules[r], out);
previous_lhs = rules[r].lhs;
}
fputs ("\n\n", out);
}

5
src/gram.h
View File

@@ -193,6 +193,11 @@ extern int glr_parser;
extern int pure_parser;
/* Print this RULE's number and lhs on OUT. If a PREVIOUS_LHS was
already displayed (by a previous call for another rule), avoid
useless repetitions. */
void rule_lhs_print PARAMS ((rule_t *rule, symbol_t *previous_lhs, FILE *out));
/* Return the length of the RHS. */
int rule_rhs_length PARAMS ((rule_t *rule));

48
src/print.c
View File

@@ -58,6 +58,7 @@ print_core (FILE *out, state_t *state)
int i;
item_number_t *sitems = state->items;
int snritems = state->nitems;
symbol_t *previous_lhs = NULL;
/* Output all the items of a state, not only its kernel. */
if (report_flag & report_itemsets)
@@ -67,40 +68,39 @@ print_core (FILE *out, state_t *state)
snritems = nritemset;
}
if (snritems)
if (!snritems)
return;
for (i = 0; i < snritems; i++)
{
for (i = 0; i < snritems; i++)
{
item_number_t *sp;
item_number_t *sp1;
int rule;
item_number_t *sp;
item_number_t *sp1;
int rule;
sp1 = sp = ritem + sitems[i];
sp1 = sp = ritem + sitems[i];
while (*sp >= 0)
sp++;
while (*sp >= 0)
sp++;
rule = -(*sp);
fprintf (out, " %s -> ", symbol_tag_get (rules[rule].lhs));
rule = -(*sp);
for (sp = rules[rule].rhs; sp < sp1; sp++)
fprintf (out, "%s ", symbol_tag_get (symbols[*sp]));
rule_lhs_print (&rules[rule], previous_lhs, out);
previous_lhs = rules[rule].lhs;
fputc ('.', out);
for (sp = rules[rule].rhs; sp < sp1; sp++)
fprintf (out, " %s", symbol_tag_get (symbols[*sp]));
fputs (" .", out);
for (/* Nothing */; *sp >= 0; ++sp)
fprintf (out, " %s", symbol_tag_get (symbols[*sp]));
for (/* Nothing */; *sp >= 0; ++sp)
fprintf (out, " %s", symbol_tag_get (symbols[*sp]));
/* Display the lookaheads? */
if (report_flag & report_lookaheads)
state_rule_lookaheads_print (state, &rules[rule], out);
fprintf (out, _(" (rule %d)"), rule - 1);
fputc ('\n', out);
}
/* Display the lookaheads? */
if (report_flag & report_lookaheads)
state_rule_lookaheads_print (state, &rules[rule], out);
fputc ('\n', out);
}
fputc ('\n', out);
}