* src/scan-gram.l (YY_OBS_INIT): Remove, replace with...

[bison.git] / src / closure.c

diff --git a/src/closure.c b/src/closure.c
index 05b299a7f228c34fbb89a20a76efd660a25a74a1..928b686747127ab507e902a0cc754fdedbcd3d99 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -22,6 +22,7 @@
 #include "quotearg.h"
 #include "bitset.h"
 #include "bitsetv.h"
 #include "quotearg.h"
 #include "bitset.h"
 #include "bitsetv.h"

+#include "bitsetv-print.h"

 #include "getargs.h"
 #include "symtab.h"
 #include "gram.h"
 #include "getargs.h"
 #include "symtab.h"
 #include "gram.h"


@@ -30,7 +31,7 @@
 #include "derives.h"
 
 /* NITEMSET is the size of the array ITEMSET.  */
 #include "derives.h"
 
 /* NITEMSET is the size of the array ITEMSET.  */

-short *itemset;
+item_number_t *itemset;

 int nritemset;
 
 static bitset ruleset;
 int nritemset;
 
 static bitset ruleset;


@@ -49,13 +50,13 @@ static bitsetv firsts = NULL;
 `-----------------*/
 
 static void
 `-----------------*/
 
 static void

-print_closure (const char *title, short *array, size_t size)
+print_closure (const char *title, item_number_t *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_t *rp;

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


@@ -78,8 +79,7 @@ print_firsts (void)
               quotearg_style (escape_quoting_style, symbols[i]->tag));
       for (j = 0; j < nvars; j++)
        if (bitset_test (FIRSTS (i), j))
               quotearg_style (escape_quoting_style, symbols[i]->tag));
       for (j = 0; j < nvars; j++)
        if (bitset_test (FIRSTS (i), j))

-         fprintf (stderr, "\t\t%d (%s)\n",
-                  j + ntokens,
+         fprintf (stderr, "\t\t%s\n",

                   quotearg_style (escape_quoting_style,
                                   symbols[j + ntokens]->tag));
     }
                   quotearg_style (escape_quoting_style,
                                   symbols[j + ntokens]->tag));
     }


@@ -100,7 +100,7 @@ print_fderives (void)
       for (j = 0; j < nrules + 1; j++)
        if (bitset_test (FDERIVES (i), j))
          {
       for (j = 0; j < nrules + 1; j++)
        if (bitset_test (FDERIVES (i), j))
          {

-           short *rhsp;
+           item_number_t *rhsp;

            fprintf (stderr, "\t\t%d:", j - 1);
            for (rhsp = rules[j].rhs; *rhsp >= 0; ++rhsp)
              fprintf (stderr, " %s",
            fprintf (stderr, "\t\t%d:", j - 1);
            for (rhsp = rules[j].rhs; *rhsp >= 0; ++rhsp)
              fprintf (stderr, " %s",


@@ -111,54 +111,6 @@ print_fderives (void)
     }
   fprintf (stderr, "\n\n");
 }
     }
   fprintf (stderr, "\n\n");
 }

-
-/*--------------------------------------------------------.
-| Display the MATRIX array of SIZE bitsets of size SIZE.  |
-`--------------------------------------------------------*/
-
-static void
-bitmatrix_print (const char *title, bitsetv matrix)
-{
-  size_t i, j;
-  size_t size = bitset_size (matrix[0]);
-
-  /* Title. */
-  fprintf (stderr, "%s BEGIN\n", title);
-
-  /* Column numbers. */
-  fputs ("   ", stderr);
-  for (i = 0; i < size; ++i)
-    putc (i / 10 ? '0' + i / 10 : ' ', stderr);
-  putc ('\n', stderr);
-  fputs ("   ", stderr);
-  for (i = 0; i < size; ++i)
-    fprintf (stderr, "%d", i % 10);
-  putc ('\n', stderr);
-
-  /* Bar. */
-  fputs ("  .", stderr);
-  for (i = 0; i < size; ++i)
-    putc ('-', stderr);
-  fputs (".\n", stderr);
-
-  /* Contents. */
-  for (i = 0; i < size; ++i)
-    {
-      fprintf (stderr, "%2d|", i);
-      for (j = 0; j < size; ++j)
-       fputs (bitset_test (matrix[i], j) ? "1" : " ", stderr);
-      fputs ("|\n", stderr);
-    }
-
-  /* Bar. */
-  fputs ("  `", stderr);
-  for (i = 0; i < size; ++i)
-    putc ('-', stderr);
-  fputs ("'\n", stderr);
-
-  /* End title. */
-  fprintf (stderr, "%s END\n\n", title);
-}

 \f
 /*------------------------------------------------------------------.
 | Set FIRSTS to be an NVARS array of NVARS bitsets indicating which |
 \f
 /*------------------------------------------------------------------.
 | Set FIRSTS to be an NVARS array of NVARS bitsets indicating which |


@@ -187,10 +139,10 @@ set_firsts (void)
       }
 
   if (trace_flag)
       }
 
   if (trace_flag)

-    bitmatrix_print ("RTC: Input", firsts);
+    bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts);

   bitsetv_reflexive_transitive_closure (firsts);
   if (trace_flag)
   bitsetv_reflexive_transitive_closure (firsts);
   if (trace_flag)

-    bitmatrix_print ("RTC: Output", firsts);
+    bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts);

 
   if (trace_flag)
     print_firsts ();
 
   if (trace_flag)
     print_firsts ();


@@ -226,12 +178,13 @@ set_fderives (void)
 
   bitsetv_free (firsts);
 }
 
   bitsetv_free (firsts);
 }

+

 \f
 
 void
 new_closure (int n)
 {
 \f
 
 void
 new_closure (int n)
 {

-  itemset = XCALLOC (short, n);
+  itemset = XCALLOC (item_number_t, n);

 
   ruleset = bitset_create (nrules + 1, BITSET_FIXED);
 
 
   ruleset = bitset_create (nrules + 1, BITSET_FIXED);
 


@@ -241,7 +194,7 @@ new_closure (int n)
 
 
 void
 
 
 void

-closure (short *core, int n)
+closure (item_number_t *core, int n)

 {
   /* Index over CORE. */
   int c;
 {
   /* Index over CORE. */
   int c;


@@ -263,7 +216,7 @@ closure (short *core, int n)
   for (ruleno = 0; ruleno < nrules + 1; ++ruleno)
     if (bitset_test (ruleset, ruleno))
       {
   for (ruleno = 0; ruleno < nrules + 1; ++ruleno)
     if (bitset_test (ruleset, ruleno))
       {

-       int itemno = rules[ruleno].rhs - ritem;
+       item_number_t itemno = rules[ruleno].rhs - ritem;

        while (c < n && core[c] < itemno)
          {
            itemset[nritemset] = core[c];
        while (c < n && core[c] < itemno)
          {
            itemset[nritemset] = core[c];