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

@@ -68,8 +68,8 @@ allocate_itemsets (void)
int count = 0;
short *symbol_count = XCALLOC (short, nsyms + nuseless_nonterminals);
for (i = 0; ritem[i]; ++i)
if (ritem[i] > 0)
for (i = 0; i < nritems; ++i)
if (ritem[i] >= 0)
{
count++;
symbol_count[ritem[i]]++;
@@ -152,7 +152,7 @@ new_itemsets (void)
for (i = 0; i < nitemset; ++i)
{
int symbol = ritem[itemset[i]];
if (symbol > 0)
if (symbol >= 0)
{
if (!kernel_size[symbol])
{