Minor code cleanup in parser table construction.

* src/LR0.c (new_itemsets): Use item_number_is_symbol_number.
(new_itemsets, save_reductions): Update for rename to nitemset.
* src/closure.c (nritemset): Rename to...
(nitemset): ... this since the "r" appears to meaningless and isn't
used in the comments.
(closure): Update for rename.
* src/closure.h (nritemset): Update extern to...
(nitemset): ... this.
* src/lalr.c (LA): Fix a typo in comments.
* src/print.c (print_core): Update for rename to nitemset.
* src/print_graph.c (print_graph): Likewise.
* src/state.h: Fix some typos in header comments.
This commit is contained in:
Joel E. Denny
2007-05-07 02:28:42 +00:00
parent 9b33de72cd
commit b09f4f4851
8 changed files with 35 additions and 20 deletions

View File

@@ -37,7 +37,7 @@
/* NITEMSET is the size of the array ITEMSET. */
item_number *itemset;
size_t nritemset;
size_t nitemset;
static bitset ruleset;
@@ -213,30 +213,30 @@ closure (item_number *core, size_t n)
if (ISVAR (ritem[core[c]]))
bitset_or (ruleset, ruleset, FDERIVES (ritem[core[c]]));
nritemset = 0;
nitemset = 0;
c = 0;
BITSET_FOR_EACH (iter, ruleset, ruleno, 0)
{
item_number itemno = rules[ruleno].rhs - ritem;
while (c < n && core[c] < itemno)
{
itemset[nritemset] = core[c];
nritemset++;
itemset[nitemset] = core[c];
nitemset++;
c++;
}
itemset[nritemset] = itemno;
nritemset++;
itemset[nitemset] = itemno;
nitemset++;
};
while (c < n)
{
itemset[nritemset] = core[c];
nritemset++;
itemset[nitemset] = core[c];
nitemset++;
c++;
}
if (trace_flag & trace_sets)
print_closure ("output", itemset, nritemset);
print_closure ("output", itemset, nitemset);
}