24-fyi-nritems-wins-over-nitems.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * src/gram.h, src/gram.c (nitems): Remove, it is an alias of
        nritems.
        Adjust dependencies.
        
        
Index: src/LR0.c
--- src/LR0.c Sat, 06 Apr 2002 00:08:37 +0200 akim
+++ src/LR0.c Sat, 06 Apr 2002 22:32:33 +0200 akim
@@ -160,7 +160,7 @@
 
   nshifts = 0;
 
-  for (i = 0; i < nitemset; ++i)
+  for (i = 0; i < nritemset; ++i)
     {
       int symbol = ritem[itemset[i]];
       if (symbol >= 0)
@@ -363,7 +363,7 @@
     return;
 
   /* Find and count the active items that represent ends of rules. */
-  for (i = 0; i < nitemset; ++i)
+  for (i = 0; i < nritemset; ++i)
     {
       int item = ritem[itemset[i]];
       if (item < 0)
Index: src/closure.c
--- src/closure.c Sat, 06 Apr 2002 00:08:37 +0200 akim
+++ src/closure.c Sat, 06 Apr 2002 22:30:36 +0200 akim
@@ -31,7 +31,7 @@
 
 /* NITEMSET is the size of the array ITEMSET.  */
 short *itemset;
-int nitemset;
+int nritemset;
 
 static bitset ruleset;
 
@@ -258,7 +258,7 @@
     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))
@@ -266,23 +266,23 @@
        int 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);
 }
 
 
Index: src/closure.h
--- src/closure.h Sat, 06 Apr 2002 00:08:37 +0200 akim
+++ src/closure.h Sat, 06 Apr 2002 22:30:36 +0200 akim
@@ -50,6 +50,6 @@
 void free_closure PARAMS ((void));
 
 extern short *itemset;
-extern int nitemset;
+extern int nritemset;
 
 #endif /* !CLOSURE_H_ */
Index: src/gram.c
--- src/gram.c Sat, 06 Apr 2002 22:14:47 +0200 akim
+++ src/gram.c Sat, 06 Apr 2002 22:31:43 +0200 akim
@@ -27,18 +27,17 @@
 
 /* comments for these variables are in gram.h  */
 
-int nitems = 0;
-int nrules = 0;
-int nsyms = 0;
-int ntokens = 1;
-int nvars = 0;
-
 short *ritem = NULL;
 int nritems = 0;
 
 rule_t *rules = NULL;
+int nrules = 0;
 
 symbol_t **symbols = NULL;
+int nsyms = 0;
+int ntokens = 1;
+int nvars = 0;
+
 short *token_translations = NULL;
 
 int start_symbol = 0;
Index: src/gram.h
--- src/gram.h Sat, 06 Apr 2002 22:14:47 +0200 akim
+++ src/gram.h Sat, 06 Apr 2002 22:30:36 +0200 akim
@@ -82,7 +82,7 @@
    says which rule it is for.
 
    The portions of RITEM come in order of increasing rule number and
-   are followed by an element which is zero to mark the end.  nitems
+   are followed by an element which is zero to mark the end.  nritems
    is the total length of ritem, not counting the final zero.  Each
    element of RITEM is called an "item" and its index in RITEM is an
    item number.
@@ -104,7 +104,6 @@
 #define        ISTOKEN(s)      ((s) < ntokens)
 #define        ISVAR(s)        ((s) >= ntokens)
 
-extern int nitems;
 extern int nrules;
 extern int nsyms;
 extern int ntokens;
Index: src/print.c
--- src/print.c Thu, 04 Apr 2002 19:44:17 +0200 akim
+++ src/print.c Sat, 06 Apr 2002 22:32:47 +0200 akim
@@ -70,20 +70,20 @@
 {
   int i;
   short *sitems = state->items;
-  int snitems   = state->nitems;
+  int snritems   = state->nitems;
 
   /* New experimental feature: if TRACE_FLAGS output all the items of
      a state, not only its kernel.  */
   if (trace_flag)
     {
-      closure (sitems, snitems);
+      closure (sitems, snritems);
       sitems = itemset;
-      snitems = nitemset;
+      snritems = nritemset;
     }
 
-  if (snitems)
+  if (snritems)
     {
-      for (i = 0; i < snitems; i++)
+      for (i = 0; i < snritems; i++)
        {
          short *sp;
          short *sp1;
Index: src/print_graph.c
--- src/print_graph.c Mon, 25 Mar 2002 21:34:54 +0100 akim
+++ src/print_graph.c Sat, 06 Apr 2002 22:32:49 +0200 akim
@@ -51,18 +51,18 @@
 {
   int i;
   short *sitems = state->items;
-  int snitems   = state->nitems;
+  int snritems   = state->nitems;
 
   /* Output all the items of a state, not only its kernel.  */
   if (trace_flag)
     {
-      closure (sitems, snitems);
+      closure (sitems, snritems);
       sitems = itemset;
-      snitems = nitemset;
+      snritems = nritemset;
     }
 
   obstack_fgrow1 (node_obstack, "state %2d\n", state->number);
-  for (i = 0; i < snitems; i++)
+  for (i = 0; i < snritems; i++)
     {
       short *sp;
       short *sp1;
Index: src/reader.c
--- src/reader.c Sat, 06 Apr 2002 22:22:16 +0200 akim
+++ src/reader.c Sat, 06 Apr 2002 22:30:36 +0200 akim
@@ -1433,7 +1433,7 @@
        /* start a new rule and record its lhs.  */
 
        ++nrules;
-       ++nitems;
+       ++nritems;
 
        p = symbol_list_new (lhs);
 
@@ -1511,7 +1511,7 @@
                   current one, so that the action just read can
                   belong to it.  */
                ++nrules;
-               ++nitems;
+               ++nritems;
                p = symbol_list_new (sdummy);
                /* Attach its lineno to that of the host rule. */
                p->line = crule->line;
@@ -1532,7 +1532,7 @@
 
                /* Insert the dummy generated by that rule into this
                   rule.  */
-               ++nitems;
+               ++nritems;
                p = symbol_list_new (sdummy);
                p1->next = p;
                p1 = p;
@@ -1542,7 +1542,7 @@
 
            if (t == tok_identifier)
              {
-               ++nitems;
+               ++nritems;
                p = symbol_list_new (symval);
                p1->next = p;
                p1 = p;
@@ -1633,7 +1633,7 @@
   p->next->next->next = symbol_list_new (NULL);
   p->next->next->next->next = grammar;
   nrules += 1;
-  nitems += 3;
+  nritems += 3;
   grammar = p;
   startval = axiom;
 
@@ -1742,10 +1742,10 @@
   symbol_list *p;
 
   /* We use short to index items.  */
-  if (nitems >= MAXSHORT)
+  if (nritems >= MAXSHORT)
     fatal (_("too many items (max %d)"), MAXSHORT);
 
-  ritem = XCALLOC (short, nitems + 1);
+  ritem = XCALLOC (short, nritems + 1);
   rules = XCALLOC (rule_t, nrules) - 1;
 
   itemno = 0;
@@ -1793,8 +1793,7 @@
     }
 
   ritem[itemno] = 0;
-  nritems = itemno;
-  assert (nritems == nitems);
+  assert (itemno == nritems);
 
   if (trace_flag)
     ritem_print (stderr);
Index: src/reduce.c
--- src/reduce.c Sat, 06 Apr 2002 22:14:47 +0200 akim
+++ src/reduce.c Sat, 06 Apr 2002 22:30:36 +0200 akim
@@ -269,7 +269,6 @@
       {
        length = rule_rhs_length (&rules[r]);
        nritems -= length + 1;
-       nitems -= length + 1;
       }
   }
 }
@@ -383,8 +382,8 @@
 
   fprintf (out, "REDUCED GRAMMAR\n\n");
   fprintf (out,
-          "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n",
-          ntokens, nvars, nsyms, nrules, nitems);
+          "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nritems = 
%d\n\n",
+          ntokens, nvars, nsyms, nrules, nritems);
   fprintf (out, "Variables\n---------\n\n");
   fprintf (out, "Value  Sprec  Sassoc  Tag\n");
   for (i = ntokens; i < nsyms; i++)
Index: src/state.h
--- src/state.h Sat, 06 Apr 2002 22:14:47 +0200 akim
+++ src/state.h Sat, 06 Apr 2002 22:32:16 +0200 akim
@@ -41,7 +41,7 @@
    the last thing accepted to reach that state.  It is the
    accessing_symbol of the core.
 
-   Each core contains a vector of nitems items which are the indices
+   Each core contains a vector of NITEMS items which are the indices
    in the ritems vector of the items that are selected in this state.
 
    The link field is used for chaining symbols that hash states by