X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/8b3df748a3ce59d3f88b84677a8bee2a8ad2d82b..b2d52318fadef8d2bf04769ec2fffb33baf6d92a:/src/closure.c?ds=inline

diff --git a/src/closure.c b/src/closure.c
index 191558a3..738ecaa8 100644
--- a/src/closure.c
+++ b/src/closure.c
@@ -30,8 +30,8 @@
 #include "derives.h"
 
 /* NITEMSET is the size of the array ITEMSET.  */
-short *itemset;
-int nitemset;
+item_number_t *itemset;
+int nritemset;
 
 static bitset ruleset;
 
@@ -49,13 +49,13 @@ static bitsetv firsts = NULL;
 `-----------------*/
 
 static void
-print_closure (const char *title, short *array, size_t size)
+print_closure (const char *title, item_number_t *array, size_t size)
 {
   size_t i;
   fprintf (stderr, "Closure: %s\n", title);
   for (i = 0; i < size; ++i)
     {
-      short *rp;
+      item_number_t *rp;
       fprintf (stderr, "  %2d: .", array[i]);
       for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
 	fprintf (stderr, " %s",
@@ -100,7 +100,7 @@ print_fderives (void)
       for (j = 0; j < nrules + 1; j++)
 	if (bitset_test (FDERIVES (i), j))
 	  {
-	    short *rhsp;
+	    item_number_t *rhsp;
 	    fprintf (stderr, "\t\t%d:", j - 1);
 	    for (rhsp = rules[j].rhs; *rhsp >= 0; ++rhsp)
 	      fprintf (stderr, " %s",
@@ -231,7 +231,7 @@ set_fderives (void)
 void
 new_closure (int n)
 {
-  itemset = XCALLOC (short, n);
+  itemset = XCALLOC (item_number_t, n);
 
   ruleset = bitset_create (nrules + 1, BITSET_FIXED);
 
@@ -241,7 +241,7 @@ new_closure (int n)
 
 
 void
-closure (short *core, int n)
+closure (item_number_t *core, int n)
 {
   /* Index over CORE. */
   int c;
@@ -258,31 +258,31 @@ closure (short *core, int n)
     if (ISVAR (ritem[core[c]]))
       bitset_or (ruleset, ruleset, FDERIVES (ritem[core[c]]));
 
-  nitemset = 0;
+  nritemset = 0;
   c = 0;
   for (ruleno = 0; ruleno < nrules + 1; ++ruleno)
     if (bitset_test (ruleset, ruleno))
       {
-	int itemno = rules[ruleno].rhs - ritem;
+	item_number_t itemno = rules[ruleno].rhs - ritem;
 	while (c < n && core[c] < itemno)
 	  {
-	    itemset[nitemset] = core[c];
-	    nitemset++;
+	    itemset[nritemset] = core[c];
+	    nritemset++;
 	    c++;
 	  }
-	itemset[nitemset] = itemno;
-	nitemset++;
+	itemset[nritemset] = itemno;
+	nritemset++;
       }
 
   while (c < n)
     {
-      itemset[nitemset] = core[c];
-      nitemset++;
+      itemset[nritemset] = core[c];
+      nritemset++;
       c++;
     }
 
   if (trace_flag)
-    print_closure ("output", itemset, nitemset);
+    print_closure ("output", itemset, nritemset);
 }