Update.

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index 078c7284aa7ba0e878ec7ca3f37a69d08a6bb1e9..746929755855c07c41d397ac7395c936e6f9ed59 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,5 +1,5 @@
 /* Match rules with nonterminals for bison,
-   Copyright 1984, 1989, 2000, 2001  Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002  Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,12 +22,18 @@
 #include "system.h"
 #include "getargs.h"
 #include "symtab.h"
-#include "types.h"
 #include "reader.h"
 #include "gram.h"
 #include "derives.h"
 
-short **derives = NULL;
+/* Linked list of rule numbers.  */
+typedef struct rule_list_s
+{
+  struct rule_list_s *next;
+  rule_t *value;
+} rule_list_t;
+
+rule_t ***derives = NULL;
 
 static void
 print_derives (void)
@@ -38,15 +44,12 @@ print_derives (void)
 
   for (i = ntokens; i < nsyms; i++)
     {
-      short *sp;
+      rule_t **rp;
       fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
-      for (sp = derives[i]; *sp > 0; sp++)
+      for (rp = derives[i]; *rp; ++rp)
        {
-         short *rhsp;
-         fprintf (stderr, "\t\t%d:", *sp);
-         for (rhsp = rules[*sp].rhs; *rhsp >= 0; ++rhsp)
-           fprintf (stderr, " %s", symbols[*rhsp]->tag);
-         fprintf (stderr, " (rule %d)\n", -*rhsp - 1);
+         fprintf (stderr, "\t\t%3d ", (*rp)->user_number);
+         rule_rhs_print (*rp, stderr);
        }
     }
 
@@ -55,51 +58,59 @@ print_derives (void)
 
 
 void
-set_derives (void)
+derives_compute (void)
 {
-  int i;
-  shorts *p;
-  short *q;
-  shorts **dset;
-  shorts *delts;
+  symbol_number_t i;
+  int r;
+  rule_t **q;
 
-  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;
 
-  p = delts;
-  for (i = nrules; i > 0; i--)
+  /* 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);
+
+  for (r = nrules - 1; r >= 0; --r)
     {
-      int lhs = rules[i].lhs->number;
+      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 = i;
+      p->value = &rules[r];
       dset[lhs] = p;
-      p++;
     }
 
-  derives = XCALLOC (short *, nvars) - ntokens;
-  q = XCALLOC (short, nvars + nrules);
+  /* DSET contains what we need under the form of a linked list.  Make
+     it a single array.  */
+
+  derives = XCALLOC (rule_t **, nvars) - ntokens;
+  q = XCALLOC (rule_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;
          p = p->next;
        }
-      *q++ = -1;
+      *q++ = NULL;
     }
 
-  if (trace_flag)
+  if (trace_flag & trace_sets)
     print_derives ();
 
-  XFREE (dset + ntokens);
-  XFREE (delts);
+  free (dset + ntokens);
+  free (delts);
 }
 
+
 void
-free_derives (void)
+derives_free (void)
 {
   XFREE (derives[ntokens]);
   XFREE (derives + ntokens);