Less shorts

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * src/closure.c (print_fderives): Use rule_rhs_print.
        * src/derives.c (print_derives): Use rule_rhs_print.
        (rule_list_t): New, replaces `shorts'.
        (set_derives): Add comments.
        * tests/sets.at (Nullable, Firsts): Adjust.

Index: src/closure.c
===================================================================
RCS file: /cvsroot/bison/bison/src/closure.c,v
retrieving revision 1.58
diff -u -u -r1.58 closure.c
--- src/closure.c 2 Jul 2002 13:51:26 -0000 1.58
+++ src/closure.c 3 Jul 2002 10:34:26 -0000
@@ -99,11 +99,8 @@
       fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
       BITSET_FOR_EACH (iter, FDERIVES (i), r, 0)
        {
-         item_number_t *rhsp = NULL;
-         fprintf (stderr, "\t\t%d:", r - 1);
-         for (rhsp = rules[r].rhs; *rhsp >= 0; ++rhsp)
-           fprintf (stderr, " %s", symbols[*rhsp]->tag);
-         fputc ('\n', stderr);
+         fprintf (stderr, "\t\t%3d ", r);
+         rule_rhs_print (&rules[r], stderr);
        }
     }
   fprintf (stderr, "\n\n");
Index: src/derives.c
===================================================================
RCS file: /cvsroot/bison/bison/src/derives.c,v
retrieving revision 1.32
diff -u -u -r1.32 derives.c
--- src/derives.c 30 Jun 2002 17:34:52 -0000 1.32
+++ src/derives.c 3 Jul 2002 10:34:26 -0000
@@ -27,6 +27,13 @@
 #include "gram.h"
 #include "derives.h"
 
+/* Linked list of rule numbers.  */
+typedef struct rule_list_s
+{
+  struct rule_list_s *next;
+  rule_number_t value;
+} rule_list_t;
+
 rule_number_t **derives = NULL;
 
 static void
@@ -42,12 +49,8 @@
       fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
       for (rp = derives[i]; *rp > 0; rp++)
        {
-         item_number_t *rhsp;
-         fprintf (stderr, "\t\t%d:", *rp);
-         for (rhsp = rules[*rp].rhs; *rhsp >= 0; ++rhsp)
-           fprintf (stderr, " %s", symbols[*rhsp]->tag);
-         fprintf (stderr, " (rule %d)\n",
-                  rule_number_of_item_number (*rhsp) - 1);
+         fprintf (stderr, "\t\t%3d ", *rp - 1);
+         rule_rhs_print (&rules[*rp], stderr);
        }
     }
 
@@ -60,31 +63,37 @@
 {
   symbol_number_t i;
   rule_number_t r;
-  shorts *p;
   rule_number_t *q;
-  shorts **dset;
-  shorts *delts;
 
-  dset = XCALLOC (shorts *, nvars) - ntokens;
-  delts = XCALLOC (shorts, nrules + 1);
+  /* DSET[NTERM] -- A linked list of the numbers of the rules whose
+     LHS is NTERM.  */
+  rule_list_t **dset = XCALLOC (rule_list_t *, nvars) - ntokens;
+
+  /* DELTS[RULE] -- There are NRULES rule number to attach to nterms.
+     Instead of performing NRULES allocations for each, have an array
+     indexed by rule numbers.  */
+  rule_list_t *delts = XCALLOC (rule_list_t, nrules + 1);
 
-  p = delts;
   for (r = nrules; r > 0; r--)
     {
       symbol_number_t lhs = rules[r].lhs->number;
+      rule_list_t *p = &delts[r];
+      /* A new LHS is found.  */
       p->next = dset[lhs];
       p->value = r;
       dset[lhs] = p;
-      p++;
     }
 
+  /* DSET contains what we need under the form of a linked list.  Make
+     it a single array.  */
+
   derives = XCALLOC (rule_number_t *, nvars) - ntokens;
-  q = XCALLOC (short, nvars + int_of_rule_number (nrules));
+  q = XCALLOC (rule_number_t, nvars + int_of_rule_number (nrules));
 
   for (i = ntokens; i < nsyms; i++)
     {
+      rule_list_t *p = dset[i];
       derives[i] = q;
-      p = dset[i];
       while (p)
        {
          *q++ = p->value;
@@ -96,9 +105,10 @@
   if (trace_flag)
     print_derives ();
 
-  XFREE (dset + ntokens);
-  XFREE (delts);
+  free (dset + ntokens);
+  free (delts);
 }
+
 
 void
 free_derives (void)
Index: src/scan-gram.c
===================================================================
RCS file: /cvsroot/bison/bison/src/scan-gram.c,v
retrieving revision 1.23
diff -u -u -r1.23 scan-gram.c
--- src/scan-gram.c 3 Jul 2002 06:52:02 -0000 1.23
+++ src/scan-gram.c 3 Jul 2002 10:34:26 -0000
@@ -19,7 +19,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/bison/bison/src/scan-gram.c,v 1.23 2002/07/03 06:52:02 
akim Exp $
+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 
vern Exp $
  */
 
 #define FLEX_SCANNER
Index: tests/sets.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/sets.at,v
retrieving revision 1.13
diff -u -u -r1.13 sets.at
--- tests/sets.at 6 May 2002 08:42:24 -0000 1.13
+++ tests/sets.at 3 Jul 2002 10:34:26 -0000
@@ -83,10 +83,10 @@
 AT_CHECK([[cat sets]], [],
 [[DERIVES
        $axiom derives
-               1: e $ (rule 0)
+                 0  e $
        e derives
-               2: 'e' (rule 1)
-               3: (rule 2)
+                 1  'e'
+                 2  /* empty */
 NULLABLE
        $axiom: no
        e: yes
@@ -98,12 +98,12 @@
                e
 FDERIVES
        $axiom derives
-               0: e $
-               1: 'e'
-               2:
+                 1  e $
+                 2  'e'
+                 3  /* empty */
        e derives
-               1: 'e'
-               2:
+                 2  'e'
+                 3  /* empty */
 ]])
 
 AT_CLEANUP
@@ -213,15 +213,15 @@
 AT_CHECK([[cat sets]], [],
 [[DERIVES
        $axiom derives
-               1: exp $ (rule 0)
+                 0  exp $
        exp derives
-               2: exp '<' exp (rule 1)
-               3: exp '>' exp (rule 2)
-               4: exp '+' exp (rule 3)
-               5: exp '-' exp (rule 4)
-               6: exp '^' exp (rule 5)
-               7: exp '=' exp (rule 6)
-               8: "exp" (rule 7)
+                 1  exp '<' exp
+                 2  exp '>' exp
+                 3  exp '+' exp
+                 4  exp '-' exp
+                 5  exp '^' exp
+                 6  exp '=' exp
+                 7  "exp"
 NULLABLE
        $axiom: no
        exp: no
@@ -233,22 +233,22 @@
                exp
 FDERIVES
        $axiom derives
-               0: exp $
-               1: exp '<' exp
-               2: exp '>' exp
-               3: exp '+' exp
-               4: exp '-' exp
-               5: exp '^' exp
-               6: exp '=' exp
-               7: "exp"
+                 1  exp $
+                 2  exp '<' exp
+                 3  exp '>' exp
+                 4  exp '+' exp
+                 5  exp '-' exp
+                 6  exp '^' exp
+                 7  exp '=' exp
+                 8  "exp"
        exp derives
-               1: exp '<' exp
-               2: exp '>' exp
-               3: exp '+' exp
-               4: exp '-' exp
-               5: exp '^' exp
-               6: exp '=' exp
-               7: "exp"
+                 2  exp '<' exp
+                 3  exp '>' exp
+                 4  exp '+' exp
+                 5  exp '-' exp
+                 6  exp '^' exp
+                 7  exp '=' exp
+                 8  "exp"
 ]])
 
 AT_CLEANUP