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

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

View File

@@ -32,6 +32,8 @@ int ntokens;
int nvars;
short *ritem = NULL;
int nritems;
rule_t *rule_table = NULL;
short *rprec = NULL;
short *rprecsym = NULL;
@@ -60,8 +62,8 @@ ritem_print (FILE *out)
{
int i;
fputs ("RITEM\n", out);
for (i = 0; ritem[i]; ++i)
if (ritem[i] > 0)
for (i = 0; i < nritems; ++i)
if (ritem[i] >= 0)
fprintf (out, " %s", tags[ritem[i]]);
else
fprintf (out, " (rule %d)\n", -ritem[i]);