* src/LR0.c (generate_states): Use nritems, not nitems, nor using

the 0-sentinel.
* src/gram.c (ritem_longest_rhs): Likewise.
* src/reduce.c (nonterminals_reduce): Likewise.
* src/print_graph.c (print_graph): Likewise.
* src/output.c (output_rule_data): Likewise.
* src/nullable.c (set_nullable):  Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3f29e7da4f26ee7758df32b13ed6d44fa27b5f41..bb362090da772f729b79ae43cb066c9d6f67ac34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-29  Akim Demaille  <akim@epita.fr>
+
+       * src/LR0.c (generate_states): Use nritems, not nitems, nor using
+       the 0-sentinel.
+       * src/gram.c (ritem_longest_rhs): Likewise.
+       * src/reduce.c (nonterminals_reduce): Likewise.
+       * src/print_graph.c (print_graph): Likewise.
+       * src/output.c (output_rule_data): Likewise.
+       * src/nullable.c (set_nullable):  Likewise.
+
 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * src/output.c: Comment changes.

diff --git a/src/LR0.c b/src/LR0.c
index c1a0a8c1f2544bf0d22476166f2eb48b93803495..3a036e84ecf0c4561b7c1a97bf72eeaba4bc6c36 100644 (file)
--- a/src/LR0.c
+++ b/src/LR0.c
@@ -391,7 +391,7 @@ void
 generate_states (void)
 {
   allocate_storage ();
-  new_closure (nitems);
+  new_closure (nritems);
   new_states ();
 
   while (this_state)

diff --git a/src/gram.c b/src/gram.c
index 219bbee5be2911e0e3198fd75c563a16a370b28a..6368051c686e01259ddbe4a80d7799a44fe8514e 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -78,14 +78,14 @@ ritem_print (FILE *out)
 size_t
 ritem_longest_rhs (void)
 {
-  short *itemp;
   int length;
   int max;
+  int i;
 
   length = 0;
   max = 0;
-  for (itemp = ritem; *itemp; itemp++)
-    if (*itemp > 0)
+  for (i = 0; i < nritems; ++i)
+    if (ritem[i] >= 0)
       {
        length++;
       }

diff --git a/src/nullable.c b/src/nullable.c
index 000b8b1be0a85c6df5f84254c2568c93749e789a..bce291ca73fd1e4315f608c7d25fbd3c655ad5dd 100644 (file)
--- a/src/nullable.c
+++ b/src/nullable.c
@@ -57,8 +57,8 @@ set_nullable (void)
      Hence we must allocate room for useless nonterminals too.  */
   shorts **rsets = XCALLOC (shorts *, nvars) - ntokens;
   /* This is said to be more elements than we actually use.
-     Supposedly nitems - nrules is enough.  But why take the risk?  */
-  shorts *relts = XCALLOC (shorts, nitems + nvars + 1);
+     Supposedly NRITEMS - NRULES is enough.  But why take the risk?  */
+  shorts *relts = XCALLOC (shorts, nritems + nvars + 1);
 
   if (trace_flag)
     fprintf (stderr, "Entering set_nullable\n");

diff --git a/src/output.c b/src/output.c
index ffeac28e504f793e67b2b72bb3faed515f4d0fde..94ad42562745436d1850644e04e644a21f376bb9 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -294,7 +294,7 @@ output_rule_data (void)
   short_tab = XMALLOC (short, nrules + 1);
   for (i = 1; i < nrules; i++)
     short_tab[i] = rule_table[i + 1].rhs - rule_table[i].rhs - 1;
-  short_tab[nrules] =  nitems - rule_table[nrules].rhs - 1;
+  short_tab[nrules] =  nritems - rule_table[nrules].rhs - 1;
   output_table_data (&format_obstack, short_tab,
                     0, 1, nrules + 1);
   muscle_insert ("r2", obstack_finish (&format_obstack));

diff --git a/src/print.c b/src/print.c
index b893c5c9d55ee4495fbd76f704709466626a7c16..90685ba09d4cafb07a68dc8891a345b86f0720a5 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -495,7 +495,7 @@ print_results (void)
      only its kernel.  Requires to run closure, which need memory
      allocation/deallocation.  */
   if (trace_flag)
-    new_closure (nitems);
+    new_closure (nritems);
   /* Storage for print_reductions.  */
   shiftset = XCALLOC (unsigned, tokensetsize);
   lookaheadset = XCALLOC (unsigned, tokensetsize);

diff --git a/src/print_graph.c b/src/print_graph.c
index 0cdba5a1d35ed82e703c276d7b1678ce6100c8f1..506d211307beaf7388918a4be3c8e1b1aedad131 100644 (file)
--- a/src/print_graph.c
+++ b/src/print_graph.c
@@ -199,7 +199,7 @@ print_graph (void)
   output_graph (&graph, fgraph);
 
   /* Output nodes and edges. */
-  new_closure (nitems);
+  new_closure (nritems);
   for (i = 0; i < nstates; i++)
     print_state (state_table[i]);
   free_closure ();

diff --git a/src/reduce.c b/src/reduce.c
index 89ff3c3b66b0f4407279606917410cb140557fcb..2b633c2a23da093f7b806e7181a93629c2d8515e 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -383,9 +383,9 @@ nonterminals_reduce (void)
        rule_table[i].precsym = nontermmap[rule_table[i].precsym];
     }
 
-  for (r = ritem; *r; r++)
-    if (ISVAR (*r))
-      *r = nontermmap[*r];
+  for (i = 0; i < nritems; ++i)
+    if (ISVAR (ritem[i]))
+      ritem[i] = nontermmap[ritem[i]];
 
   start_symbol = nontermmap[start_symbol];