Agregate yylval and yylloc.

[bison.git] / src / closure.c

diff --git a/src/closure.c b/src/closure.c
index d24e2eab73dc6574c434accd111a3b76a01cf438..ff3109caf0c5736d25da0c55ed140e81b1ab7b57 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -1,51 +1,51 @@
-/* Subroutines for bison
-   Copyright 1984, 1989, 2000, 2001 Free Software Foundation, Inc.
+/* Closures for Bison
+
+   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2007 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 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 program 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 3 of the License, or
+   (at your option) any later version.

 
 

-   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.
+   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
 
    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 <bitset.h>
+#include <bitsetv-print.h>
+#include <bitsetv.h>
+#include <quotearg.h>
+
+#include "closure.h"
+#include "derives.h"

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

-#include "symtab.h"

 #include "gram.h"
 #include "reader.h"
 #include "gram.h"
 #include "reader.h"

-#include "closure.h"
-#include "derives.h"
-#include "warshall.h"
+#include "symtab.h"

 
 /* NITEMSET is the size of the array ITEMSET.  */
 
 /* NITEMSET is the size of the array ITEMSET.  */

-short *itemset;
-int nitemset;
+item_number *itemset;
+size_t nitemset;

 
 

-static unsigned *ruleset;
+static bitset ruleset;

 
 /* internal data.  See comments before set_fderives and set_firsts.  */
 
 /* internal data.  See comments before set_fderives and set_firsts.  */

-static unsigned *fderives;
-static unsigned *firsts;
+static bitsetv fderives = NULL;
+static bitsetv firsts = NULL;

 
 /* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var.  */
 
 /* Retrieve the FDERIVES/FIRSTS sets of the nonterminals numbered Var.  */

-#define FDERIVES(Var)   (fderives + ((Var) - ntokens) * rulesetsize)
-#define   FIRSTS(Var)   (firsts   + ((Var) - ntokens) * varsetsize)
-
-/* number of words required to hold a bit for each rule */
-static int rulesetsize;
-
-/* number of words required to hold a bit for each variable */
-static int varsetsize;
+#define FDERIVES(Var)   fderives[(Var) - ntokens]
+#define   FIRSTS(Var)   firsts[(Var) - ntokens]

 \f
 
 /*-----------------.
 \f
 
 /*-----------------.


@@ -53,13 +53,13 @@ static int varsetsize;
 `-----------------*/
 
 static void
 `-----------------*/
 
 static void

-print_closure (const char *title, short *array, size_t size)
+print_closure (char const *title, item_number *array, size_t size)

 {
   size_t i;
   fprintf (stderr, "Closure: %s\n", title);
   for (i = 0; i < size; ++i)
     {
 {
   size_t i;
   fprintf (stderr, "Closure: %s\n", title);
   for (i = 0; i < size; ++i)
     {

-      short *rp;
+      item_number *rp;

       fprintf (stderr, "  %2d: .", array[i]);
       for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
        fprintf (stderr, " %s", symbols[*rp]->tag);
       fprintf (stderr, "  %2d: .", array[i]);
       for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
        fprintf (stderr, " %s", symbols[*rp]->tag);


@@ -72,16 +72,18 @@ print_closure (const char *title, short *array, size_t size)
 static void
 print_firsts (void)
 {
 static void
 print_firsts (void)
 {

-  int i, j;
+  symbol_number i, j;

 
   fprintf (stderr, "FIRSTS\n");
   for (i = ntokens; i < nsyms; i++)
     {
 
   fprintf (stderr, "FIRSTS\n");
   for (i = ntokens; i < nsyms; i++)
     {

+      bitset_iterator iter;

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

-      for (j = 0; j < nvars; j++)
-       if (BITISSET (FIRSTS (i), j))
-         fprintf (stderr, "\t\t%d (%s)\n",
-                  j + ntokens, symbols[j + ntokens]->tag);
+      BITSET_FOR_EACH (iter, FIRSTS (i), j, 0)
+       {
+         fprintf (stderr, "\t\t%s\n",
+                  symbols[j + ntokens]->tag);
+       }

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


@@ -91,56 +93,55 @@ static void
 print_fderives (void)
 {
   int i;
 print_fderives (void)
 {
   int i;

-  int j;
+  rule_number r;

 
   fprintf (stderr, "FDERIVES\n");
 
   fprintf (stderr, "FDERIVES\n");

-

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

+      bitset_iterator iter;

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

-      for (j = 0; j <= nrules; j++)
-       if (BITISSET (FDERIVES (i), j))
-         {
-           short *rhsp;
-           fprintf (stderr, "\t\t%d:", j - 1);
-           for (rhsp = &ritem[rules[j].rhs]; *rhsp >= 0; ++rhsp)
-             fprintf (stderr, " %s", symbols[*rhsp]->tag);
-           fputc ('\n', stderr);
-         }
+      BITSET_FOR_EACH (iter, FDERIVES (i), r, 0)
+       {
+         fprintf (stderr, "\t\t%3d ", r);
+         rule_rhs_print (&rules[r], stderr);
+       }

     }
   fprintf (stderr, "\n\n");
 }
 \f
     }
   fprintf (stderr, "\n\n");
 }
 \f

-/*-------------------------------------------------------------------.
-| Set FIRSTS to be an NVARS by NVARS bit matrix indicating which     |
-| items can represent the beginning of the input corresponding to    |
-| which other items.                                                 |
-|                                                                    |
-| For example, if some rule expands symbol 5 into the sequence of    |
-| symbols 8 3 20, the symbol 8 can be the beginning of the data for  |
-| symbol 5, so the bit [8 - ntokens, 5 - ntokens] in firsts is set.  |
-`-------------------------------------------------------------------*/
+/*------------------------------------------------------------------.
+| Set FIRSTS to be an NVARS array of NVARS bitsets indicating which |
+| items can represent the beginning of the input corresponding to   |
+| which other items.                                                |
+|                                                                   |
+| For example, if some rule expands symbol 5 into the sequence of   |
+| symbols 8 3 20, the symbol 8 can be the beginning of the data for |
+| symbol 5, so the bit [8 - ntokens] in first[5 - ntokens] (= FIRST |
+| (5)) is set.                                                      |
+`------------------------------------------------------------------*/

 
 static void
 set_firsts (void)
 {
 
 static void
 set_firsts (void)
 {

-  int i, j;
-
-  varsetsize = WORDSIZE (nvars);
+  symbol_number i, j;

 
 

-  firsts = XCALLOC (unsigned, nvars * varsetsize);
+  firsts = bitsetv_create (nvars, nvars, BITSET_FIXED);

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

-    for (j = 0; derives[i][j] >= 0; ++j)
+    for (j = 0; derives[i - ntokens][j]; ++j)

       {
       {

-       int symbol = ritem[rules[derives[i][j]].rhs];
-       if (ISVAR (symbol))
-         SETBIT (FIRSTS (i), symbol - ntokens);
+       item_number sym = derives[i - ntokens][j]->rhs[0];
+       if (ISVAR (sym))
+         bitset_set (FIRSTS (i), sym - ntokens);

       }
 
       }
 

-  RTC (firsts, nvars);
+  if (trace_flag & trace_sets)
+    bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts);
+  bitsetv_reflexive_transitive_closure (firsts);
+  if (trace_flag & trace_sets)
+    bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts);

 
 

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

     print_firsts ();
 }
 
     print_firsts ();
 }
 


@@ -157,32 +158,33 @@ set_firsts (void)
 static void
 set_fderives (void)
 {
 static void
 set_fderives (void)
 {

-  int i, j, k;
+  symbol_number i, j;
+  rule_number k;

 
 

-  fderives = XCALLOC (unsigned, nvars * rulesetsize);
+  fderives = bitsetv_create (nvars, nrules, BITSET_FIXED);

 
   set_firsts ();
 
   for (i = ntokens; i < nsyms; ++i)
     for (j = ntokens; j < nsyms; ++j)
 
   set_firsts ();
 
   for (i = ntokens; i < nsyms; ++i)
     for (j = ntokens; j < nsyms; ++j)

-      if (BITISSET (FIRSTS (i), j - ntokens))
-       for (k = 0; derives[j][k] > 0; ++k)
-         SETBIT (FDERIVES (i), derives[j][k]);
+      if (bitset_test (FIRSTS (i), j - ntokens))
+       for (k = 0; derives[j - ntokens][k]; ++k)
+         bitset_set (FDERIVES (i), derives[j - ntokens][k]->number);

 
 

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

     print_fderives ();
 
     print_fderives ();
 

-  XFREE (firsts);
+  bitsetv_free (firsts);

 }
 }

+

 \f
 
 void
 \f
 
 void

-new_closure (int n)
+new_closure (unsigned int n)

 {
 {

-  itemset = XCALLOC (short, n);
+  itemset = xnmalloc (n, sizeof *itemset);

 
 

-  rulesetsize = WORDSIZE (nrules + 1);
-  ruleset = XCALLOC (unsigned, rulesetsize);
+  ruleset = bitset_create (nrules, BITSET_FIXED);

 
   set_fderives ();
 }
 
   set_fderives ();
 }


@@ -190,51 +192,41 @@ new_closure (int n)
 
 
 void
 
 
 void

-closure (short *core, int n)
+closure (item_number *core, size_t n)

 {
   /* Index over CORE. */
 {
   /* Index over CORE. */

-  int c;
-
-  /* Index over RULESET. */
-  int r;
+  size_t c;

 
   /* A bit index over RULESET. */
 
   /* A bit index over RULESET. */

-  int ruleno;
+  rule_number ruleno;

 
 

-  if (trace_flag)
+  bitset_iterator iter;
+
+  if (trace_flag & trace_sets)

     print_closure ("input", core, n);
 
     print_closure ("input", core, n);
 

-  if (n == 0)
-    {
-      for (r = 0; r < rulesetsize; ++r)
-       ruleset[r] = FDERIVES (start_symbol)[r];
-    }
-  else
-    {
-      for (r = 0; r < rulesetsize; ++r)
-       ruleset[r] = 0;
+  bitset_zero (ruleset);

 
 

-      for (c = 0; c < n; ++c)
-       if (ISVAR (ritem[core[c]]))
-         for (r = 0; r < rulesetsize; ++r)
-           ruleset[r] |= FDERIVES (ritem[core[c]])[r];
-    }
+  for (c = 0; c < n; ++c)
+    if (ISVAR (ritem[core[c]]))
+      bitset_or (ruleset, ruleset, FDERIVES (ritem[core[c]]));

 
 

+  /* core is sorted on item index in ritem, which is sorted on rule number.
+     Compute itemset with the same sort.  */

   nitemset = 0;
   c = 0;
   nitemset = 0;
   c = 0;

-  for (ruleno = 0; ruleno < nrules + 1; ++ruleno)
-    if (BITISSET (ruleset, ruleno))
-      {
-       int itemno = rules[ruleno].rhs;
-       while (c < n && core[c] < itemno)
-         {
-           itemset[nitemset] = core[c];
-           nitemset++;
-           c++;
-         }
-       itemset[nitemset] = itemno;
-       nitemset++;
-      }
+  BITSET_FOR_EACH (iter, ruleset, ruleno, 0)
+    {
+      item_number itemno = rules[ruleno].rhs - ritem;
+      while (c < n && core[c] < itemno)
+       {
+         itemset[nitemset] = core[c];
+         nitemset++;
+         c++;
+       }
+      itemset[nitemset] = itemno;
+      nitemset++;
+    };

 
   while (c < n)
     {
 
   while (c < n)
     {


@@ -243,7 +235,7 @@ closure (short *core, int n)
       c++;
     }
 
       c++;
     }
 

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

     print_closure ("output", itemset, nitemset);
 }
 
     print_closure ("output", itemset, nitemset);
 }
 


@@ -251,7 +243,7 @@ closure (short *core, int n)
 void
 free_closure (void)
 {
 void
 free_closure (void)
 {

-  XFREE (itemset);
-  XFREE (ruleset);
-  XFREE (fderives);
+  free (itemset);
+  bitset_free (ruleset);
+  bitsetv_free (fderives);

 }
 }