(nullable_compute): Do not subtract from the returned value of malloc.

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index 7b862d8223190da235484d96ecee69c165dd27d9..da881ecc521e8277974e22adcb88a24c6c39b94b 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,5 +1,7 @@
 /* Match rules with nonterminals for bison,
 /* 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -19,92 +21,101 @@
    Boston, MA 02111-1307, USA.  */
 
 
    Boston, MA 02111-1307, USA.  */
 
 

-/* set_derives finds, for each variable (nonterminal), which rules can
-   derive it.  It sets up the value of derives so that derives[i -
-   ntokens] points to a vector of rule numbers, terminated with -1.
-   */
-

 #include "system.h"
 #include "system.h"

+

 #include "getargs.h"
 #include "getargs.h"

-#include "types.h"
-#include "reader.h"
-#include "gram.h"
+

 #include "derives.h"
 #include "derives.h"

+#include "gram.h"
+#include "reader.h"
+#include "symtab.h"

 
 

-short **derives;
+/* Linked list of rule numbers.  */
+typedef struct rule_list
+{
+  struct rule_list *next;
+  rule *value;
+} rule_list;

 
 

+rule ***derives = NULL;

 
 static void
 print_derives (void)
 {
   int i;
 
 static void
 print_derives (void)
 {
   int i;

-  short *sp;

 
 

-  fputs ("\n\n\nDERIVES\n\n", stderr);
+  fputs ("DERIVES\n", stderr);

 
   for (i = ntokens; i < nsyms; i++)
     {
 
   for (i = ntokens; i < nsyms; i++)
     {

-      fprintf (stderr, "%s derives", tags[i]);
-      for (sp = derives[i]; *sp > 0; sp++)
-       fprintf (stderr, "  %d", *sp);
-      putc ('\n', stderr);
+      rule **rp;
+      fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
+      for (rp = derives[i - ntokens]; *rp; ++rp)
+       {
+         fprintf (stderr, "\t\t%3d ", (*rp)->user_number);
+         rule_rhs_print (*rp, stderr);
+       }

     }
 
     }
 

-  putc ('\n', stderr);
+  fputs ("\n\n", stderr);

 }
 
 
 void
 }
 
 
 void

-set_derives (void)
+derives_compute (void)

 {
 {

-  int i;
-  int lhs;
-  shorts *p;
-  short *q;
-  shorts **dset;
-  shorts *delts;
+  symbol_number i;
+  int r;
+  rule **q;
+
+  /* DSET[NTERM - NTOKENS] -- A linked list of the numbers of the rules
+     whose LHS is NTERM.  */
+  rule_list **dset = CALLOC (dset, nvars);

 
 

-  dset = XCALLOC (shorts *, nvars) - ntokens;
-  delts = XCALLOC (shorts, nrules + 1);
+  /* 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 *delts = CALLOC (delts, nrules);

 
 

-  p = delts;
-  for (i = nrules; i > 0; i--)
+  for (r = nrules - 1; r >= 0; --r)

     {
     {

-      lhs = rule_table[i].lhs;
-      if (lhs >= 0)
-       {
-         p->next = dset[lhs];
-         p->value = i;
-         dset[lhs] = p;
-         p++;
-       }
+      symbol_number lhs = rules[r].lhs->number;
+      rule_list *p = &delts[r];
+      /* A new LHS is found.  */
+      p->next = dset[lhs - ntokens];
+      p->value = &rules[r];
+      dset[lhs - ntokens] = 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.  */
+
+  CALLOC (derives, nvars);
+  CALLOC (q, nvars + nrules);

 
   for (i = ntokens; i < nsyms; i++)
     {
 
   for (i = ntokens; i < nsyms; i++)
     {

-      derives[i] = q;
-      p = dset[i];
+      rule_list *p = dset[i - ntokens];
+      derives[i - ntokens] = q;

       while (p)
        {
          *q++ = p->value;
          p = p->next;
        }
       while (p)
        {
          *q++ = p->value;
          p = p->next;
        }

-      *q++ = -1;
+      *q++ = NULL;

     }
 
     }
 

-  if (trace_flag)
+  if (trace_flag & trace_sets)

     print_derives ();
 
     print_derives ();
 

-  XFREE (dset + ntokens);
-  XFREE (delts);
+  free (dset);
+  free (delts);

 }
 
 }
 

+

 void
 void

-free_derives (void)
+derives_free (void)

 {
 {

-  XFREE (derives[ntokens]);
-  XFREE (derives + ntokens);
+  XFREE (derives[0]);
+  XFREE (derives);

 }
 }