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

Try to make the use of the eoftoken valid. Given that its value

Browse Source 
is 0 which was also used as a sentinel in ritem, (i) make sure >= 0
is used instead of > 0 where appropriate, (ii), depend upon nritems
instead of the 0-sentinel.
* src/gram.h, src/gram.c (nritems): New.
Expected to be duplication of nitems, but for the time being...
* src/reader.c (packgram): Assert nritems and nitems are equal.
* src/LR0.c (allocate_itemsets, new_itemsets): Adjust.
* src/closure.c (print_closure, print_fderives): Likewise.
* src/gram.c (ritem_print): Likewise.
* src/print.c (print_core, print_grammar): Likewise.
* src/print_graph.c: Likewise.
This commit is contained in:
Akim Demaille
2001-12-27 18:13:31 +00:00
parent b7c49edf13
commit 75142d452b
9 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/print.c
View File

@@ -88,7 +88,7 @@ print_core (FILE *out, state_t *state)
sp1 = sp = ritem + sitems[i];
while (*sp > 0)
while (*sp >= 0)
sp++;
rule = -(*sp);
@@ -99,7 +99,7 @@ print_core (FILE *out, state_t *state)
fputc ('.', out);
for (/* Nothing */; *sp > 0; ++sp)
for (/* Nothing */; *sp >= 0; ++sp)
fprintf (out, " %s", escape (tags[*sp]));
fprintf (out, _(" (rule %d)"), rule);
@@ -377,8 +377,8 @@ print_grammar (FILE *out)
fprintf (out, _(" %3d %3d %s ->"),
i, rule_table[i].line, escape (tags[rule_table[i].lhs]));
rule = &ritem[rule_table[i].rhs];
if (*rule > 0)
while (*rule > 0)
if (*rule >= 0)
while (*rule >= 0)
fprintf (out, " %s", escape (tags[*rule++]));
else
fprintf (out, " /* %s */", _("empty"));
@@ -399,7 +399,7 @@ print_grammar (FILE *out)
sprintf (buffer, " (%d)", i);
for (j = 1; j <= nrules; j++)
for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
for (rule = &ritem[rule_table[j].rhs]; *rule >= 0; rule++)
if (*rule == token_translations[i])
{
END_TEST (65);
@@ -420,7 +420,7 @@ print_grammar (FILE *out)
{
if (rule_table[j].lhs == i)
left_count++;
for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
for (rule = &ritem[rule_table[j].rhs]; *rule >= 0; rule++)
if (*rule == i)
{
right_count++;
@@ -455,7 +455,7 @@ print_grammar (FILE *out)
sprintf (buffer + strlen (buffer), _(" on right:"));
for (j = 1; j <= nrules; j++)
{
for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
for (rule = &ritem[rule_table[j].rhs]; *rule >= 0; rule++)
if (*rule == i)
{
END_TEST (65);