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

* src/state.h (reductions_t): Rename member `nreds' as num.

Browse Source 
(errs_t): Rename members `nerrs' and `errs' as `num' and `symbols'.
* src/state.c (ERRS_ALLOC, REDUCTIONS_ALLOC): Use the correct types.
This commit is contained in:
Akim Demaille
2002-06-30 17:34:31 +00:00
parent ccaf65bc63
commit d257636504
7 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/print.c
View File

@@ -178,9 +178,9 @@ print_errs (FILE *out, state_t *state)
int i;
/* Compute the width of the lookaheads column. */
for (i = 0; i < errp->nerrs; ++i)
if (errp->errs[i])
max_length (&width, symbol_tag_get (symbols[errp->errs[i]]));
for (i = 0; i < errp->num; ++i)
if (errp->symbols[i])
max_length (&width, symbol_tag_get (symbols[errp->symbols[i]]));
/* Nothing to report. */
if (!width)
@@ -190,10 +190,10 @@ print_errs (FILE *out, state_t *state)
width += 2;
/* Report lookaheads and errors. */
for (i = 0; i < errp->nerrs; ++i)
if (errp->errs[i])
for (i = 0; i < errp->num; ++i)
if (errp->symbols[i])
{
const char *tag = symbol_tag_get (symbols[errp->errs[i]]);
const char *tag = symbol_tag_get (symbols[errp->symbols[i]]);
int j;
fprintf (out, " %s", tag);
for (j = width - strlen (tag); j > 0; --j)
@@ -240,9 +240,9 @@ state_default_rule (state_t *state)
we raise an error (due to %nonassoc). */
{
errs_t *errp = state->errs;
for (i = 0; i < errp->nerrs; i++)
if (errp->errs[i])
bitset_set (shiftset, errp->errs[i]);
for (i = 0; i < errp->num; i++)
if (errp->symbols[i])
bitset_set (shiftset, errp->symbols[i]);
}
for (i = 0; i < state->nlookaheads; ++i)
@@ -308,7 +308,7 @@ print_reductions (FILE *out, state_t *state)
size_t width = 0;
int i, j;
if (redp->nreds == 0)
if (redp->num == 0)
return;
default_rule = state_default_rule (state);
@@ -398,7 +398,7 @@ print_actions (FILE *out, state_t *state)
reductions_t *redp = state->reductions;
transitions_t *transitions = state->shifts;
if (transitions->num == 0 && redp->nreds == 0)
if (transitions->num == 0 && redp->num == 0)
{
fputc ('\n', out);
if (state->number == final_state->number)