Merge remote-tracking branch 'origin/maint'

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index 10d3adbf51054e0859bbf5ce84cafd25354126a5..c834f0b0d0941fe81542ba396602b546b8cc3e24 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,26 +1,24 @@
 /* Match rules with nonterminals for bison,
 
 /* Match rules with nonterminals for bison,
 

-   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software
+   Copyright (C) 1984, 1989, 2000-2003, 2005, 2009-2013 Free Software

    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 

-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

+#include <config.h>

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


@@ -37,7 +35,7 @@ typedef struct rule_list
   rule *value;
 } rule_list;
 
   rule *value;
 } rule_list;
 

-rule ***derives = NULL;
+rule ***derives;

 
 static void
 print_derives (void)
 
 static void
 print_derives (void)


@@ -49,12 +47,13 @@ print_derives (void)
   for (i = ntokens; i < nsyms; i++)
     {
       rule **rp;
   for (i = ntokens; i < nsyms; i++)
     {
       rule **rp;

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

     }
 
   fputs ("\n\n", stderr);
     }
 
   fputs ("\n\n", stderr);


@@ -65,50 +64,50 @@ void
 derives_compute (void)
 {
   symbol_number i;
 derives_compute (void)
 {
   symbol_number i;

-  int r;
+  rule_number r;

   rule **q;
 
   rule **q;
 

-  /* DSET[NTERM] -- A linked list of the numbers of the rules whose
-     LHS is NTERM.  */
-  rule_list **dset = XCALLOC (rule_list *, nvars) - ntokens;
+  /* DSET[NTERM - NTOKENS] -- A linked list of the numbers of the rules
+     whose LHS is NTERM.  */
+  rule_list **dset = xcalloc (nvars, sizeof *dset);

 
   /* 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.  */
 
   /* 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 = XCALLOC (rule_list, nrules);
+  rule_list *delts = xnmalloc (nrules, sizeof *delts);

 
   for (r = nrules - 1; r >= 0; --r)
     {
       symbol_number lhs = rules[r].lhs->number;
       rule_list *p = &delts[r];
       /* A new LHS is found.  */
 
   for (r = nrules - 1; r >= 0; --r)
     {
       symbol_number lhs = rules[r].lhs->number;
       rule_list *p = &delts[r];
       /* A new LHS is found.  */

-      p->next = dset[lhs];
+      p->next = dset[lhs - ntokens];

       p->value = &rules[r];
       p->value = &rules[r];

-      dset[lhs] = p;
+      dset[lhs - ntokens] = p;

     }
 
   /* DSET contains what we need under the form of a linked list.  Make
      it a single array.  */
 
     }
 
   /* DSET contains what we need under the form of a linked list.  Make
      it a single array.  */
 

-  derives = XCALLOC (rule **, nvars) - ntokens;
-  q = XCALLOC (rule *, nvars + int_of_rule_number (nrules));
+  derives = xnmalloc (nvars, sizeof *derives);
+  q = xnmalloc (nvars + nrules, sizeof *q);

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

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

       while (p)
       while (p)

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

       *q++ = NULL;
     }
 
   if (trace_flag & trace_sets)
     print_derives ();
 
       *q++ = NULL;
     }
 
   if (trace_flag & trace_sets)
     print_derives ();
 

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

   free (delts);
 }
 
   free (delts);
 }
 


@@ -116,6 +115,6 @@ derives_compute (void)
 void
 derives_free (void)
 {
 void
 derives_free (void)
 {

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

 }
 }