* data/Makefile.am (dist_pkgdata_DATA): Remove push.c.

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index 746929755855c07c41d397ac7395c936e6f9ed59..dc6049c7979d56f4e22d1b23ca63e1394e80d89b 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,39 +1,41 @@
 /* Match rules with nonterminals for bison,
 /* Match rules with nonterminals for bison,

-   Copyright (C) 1984, 1989, 2000, 2001, 2002  Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003, 2005 Free
+   Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    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 "system.h"

+

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

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

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

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

 
 /* Linked list of rule numbers.  */
 
 /* Linked list of rule numbers.  */

-typedef struct rule_list_s
+typedef struct rule_list

 {
 {

-  struct rule_list_s *next;
-  rule_t *value;
-} rule_list_t;
+  struct rule_list *next;
+  rule *value;
+} rule_list;

 
 

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

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


@@ -44,9 +46,9 @@ print_derives (void)
 
   for (i = ntokens; i < nsyms; i++)
     {
 
   for (i = ntokens; i < nsyms; i++)
     {

-      rule_t **rp;
+      rule **rp;

       fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
       fprintf (stderr, "\t%s derives\n", symbols[i]->tag);

-      for (rp = derives[i]; *rp; ++rp)
+      for (rp = derives[i - ntokens]; *rp; ++rp)

        {
          fprintf (stderr, "\t\t%3d ", (*rp)->user_number);
          rule_rhs_print (*rp, stderr);
        {
          fprintf (stderr, "\t\t%3d ", (*rp)->user_number);
          rule_rhs_print (*rp, stderr);


@@ -60,39 +62,39 @@ print_derives (void)
 void
 derives_compute (void)
 {
 void
 derives_compute (void)
 {

-  symbol_number_t i;
-  int r;
-  rule_t **q;
+  symbol_number i;
+  rule_number r;
+  rule **q;

 
 

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

 
   for (r = nrules - 1; r >= 0; --r)
     {
 
   for (r = nrules - 1; r >= 0; --r)
     {

-      symbol_number_t lhs = rules[r].lhs->number;
-      rule_list_t *p = &delts[r];
+      symbol_number lhs = rules[r].lhs->number;
+      rule_list *p = &delts[r];

       /* A new LHS is found.  */
       /* 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_t **, nvars) - ntokens;
-  q = XCALLOC (rule_t *, 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_t *p = dset[i];
-      derives[i] = q;
+      rule_list *p = dset[i - ntokens];
+      derives[i - ntokens] = q;

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


@@ -104,7 +106,7 @@ derives_compute (void)
   if (trace_flag & trace_sets)
     print_derives ();
 
   if (trace_flag & trace_sets)
     print_derives ();
 

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

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


@@ -112,6 +114,6 @@ derives_compute (void)
 void
 derives_free (void)
 {
 void
 derives_free (void)
 {

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

 }
 }