* data/glr.c (YYRHSLOC): Move its definition next to its uses.

[bison.git] / src / derives.c

diff --git a/src/derives.c b/src/derives.c
index a9c6905cc26df7c57eac39c5a482c1d05271995b..7e20fe5a29f0d7153c7b67c4b2205be143955a31 100644 (file)
--- a/src/derives.c
+++ b/src/derives.c
@@ -1,123 +1,121 @@
 /* Match rules with nonterminals for bison,
 /* Match rules with nonterminals for bison,

-   Copyright (C) 1984, 1989 Free Software Foundation, Inc.

 
 

-This file is part of Bison, the GNU Compiler Compiler.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2003 Free Software
+   Foundation, Inc.

 
 

-Bison is free software; you can redistribute it and/or modify
-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.
+   This file is part of Bison, the GNU Compiler Compiler.

 
 

-Bison 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.
+   Bison is free software; you can redistribute it and/or modify
+   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.

 
 

-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.  */
+   Bison 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
+   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.  */

 
 

-/* 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 "alloc.h"
-#include "types.h"
-#include "gram.h"

 
 

-extern void set_derives PARAMS((void));
-extern void free_derives PARAMS((void));
+#include "getargs.h"

 
 

-#if DEBUG
-static void print_derives PARAMS((void));
-extern char **tags;
-#endif
+#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;

 
 

-void
-set_derives (void)
+rule ***derives = NULL;
+
+static void
+print_derives (void)

 {
 {

-  register int i;
-  register int lhs;
-  register shorts *p;
-  register short *q;
-  register shorts **dset;
-  register shorts *delts;
-
-  dset = NEW2(nvars, shorts *) - ntokens;
-  delts = NEW2(nrules + 1, shorts);
-
-  p = delts;
-  for (i = nrules; i > 0; i--)
-    {
-      lhs = rlhs[i];
-      if (lhs >= 0)
-       {
-         p->next = dset[lhs];
-         p->value = i;
-         dset[lhs] = p;
-         p++;
-       }
-    }
+  int i;

 
 

-  derives = NEW2(nvars, short *) - ntokens;
-  q = NEW2(nvars + nrules, short);
+  fputs ("DERIVES\n", stderr);

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

-      derives[i] = q;
-      p = dset[i];
-      while (p)
+      rule **rp;
+      fprintf (stderr, "\t%s derives\n", symbols[i]->tag);
+      for (rp = derives[i - ntokens]; *rp; ++rp)

        {
        {

-         *q++ = p->value;
-         p = p->next;
+         fprintf (stderr, "\t\t%3d ", (*rp)->user_number);
+         rule_rhs_print (*rp, stderr);

        }
        }

-      *q++ = -1;

     }
 
     }
 

-#ifdef DEBUG
-  print_derives();
-#endif
-
-  FREE(dset + ntokens);
-  FREE(delts);
+  fputs ("\n\n", stderr);

 }
 
 }
 

+

 void
 void

-free_derives (void)
+derives_compute (void)

 {
 {

-  FREE(derives[ntokens]);
-  FREE(derives + ntokens);
-}
+  symbol_number i;
+  rule_number 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);

 
 

+  /* 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);

 
 

-#ifdef DEBUG
+  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 - ntokens];
+      p->value = &rules[r];
+      dset[lhs - ntokens] = p;
+    }

 
 

-static void
-print_derives (void)
-{
-  register int i;
-  register short *sp;
+  /* DSET contains what we need under the form of a linked list.  Make
+     it a single array.  */

 
 

-  printf(_("\n\n\nDERIVES\n\n"));
+  CALLOC (derives, nvars);
+  CALLOC (q, nvars + nrules);

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

-      printf(_("%s derives"), tags[i]);
-      for (sp = derives[i]; *sp > 0; sp++)
+      rule_list *p = dset[i - ntokens];
+      derives[i - ntokens] = q;
+      while (p)

        {
        {

-         printf("  %d", *sp);
+         *q++ = p->value;
+         p = p->next;

        }
        }

-      putchar('\n');
+      *q++ = NULL;

     }
 
     }
 

-  putchar('\n');
+  if (trace_flag & trace_sets)
+    print_derives ();
+
+  free (dset);
+  free (delts);

 }
 
 }
 

-#endif
+
+void
+derives_free (void)
+{
+  XFREE (derives[0]);
+  XFREE (derives);
+}