Regen.

[bison.git] / src / closure.c

diff --git a/src/closure.c b/src/closure.c
index 45b85c6812db2bde254193c709f347528809a3f8..d24e2eab73dc6574c434accd111a3b76a01cf438 100644 (file)
--- a/src/closure.c
+++ b/src/closure.c
@@ -20,6 +20,7 @@
 
 #include "system.h"
 #include "getargs.h"
 
 #include "system.h"
 #include "getargs.h"

+#include "symtab.h"

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


@@ -61,8 +62,8 @@ print_closure (const char *title, short *array, size_t size)
       short *rp;
       fprintf (stderr, "  %2d: .", array[i]);
       for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
       short *rp;
       fprintf (stderr, "  %2d: .", array[i]);
       for (rp = &ritem[array[i]]; *rp >= 0; ++rp)

-       fprintf (stderr, " %s", tags[*rp]);
-      fprintf (stderr, "  (rule %d)\n", -*rp);
+       fprintf (stderr, " %s", symbols[*rp]->tag);
+      fprintf (stderr, "  (rule %d)\n", -*rp - 1);

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


@@ -76,10 +77,11 @@ print_firsts (void)
   fprintf (stderr, "FIRSTS\n");
   for (i = ntokens; i < nsyms; i++)
     {
   fprintf (stderr, "FIRSTS\n");
   for (i = ntokens; i < nsyms; i++)
     {

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

       for (j = 0; j < nvars; j++)
        if (BITISSET (FIRSTS (i), j))
       for (j = 0; j < nvars; j++)
        if (BITISSET (FIRSTS (i), j))

-         fprintf (stderr, "\t\t%d (%s)\n", j + ntokens, tags[j + ntokens]);
+         fprintf (stderr, "\t\t%d (%s)\n",
+                  j + ntokens, symbols[j + ntokens]->tag);

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


@@ -95,14 +97,14 @@ print_fderives (void)
 
   for (i = ntokens; i < nsyms; i++)
     {
 
   for (i = ntokens; i < nsyms; i++)
     {

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

       for (j = 0; j <= nrules; j++)
        if (BITISSET (FDERIVES (i), j))
          {
            short *rhsp;
       for (j = 0; j <= nrules; j++)
        if (BITISSET (FDERIVES (i), j))
          {
            short *rhsp;

-           fprintf (stderr, "\t\t%d:", j);
-           for (rhsp = ritem + rule_table[j].rhs; *rhsp >= 0; ++rhsp)
-             fprintf (stderr, " %s", tags[*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);
          }
     }
            fputc ('\n', stderr);
          }
     }


@@ -131,7 +133,7 @@ set_firsts (void)
   for (i = ntokens; i < nsyms; i++)
     for (j = 0; derives[i][j] >= 0; ++j)
       {
   for (i = ntokens; i < nsyms; i++)
     for (j = 0; derives[i][j] >= 0; ++j)
       {

-       int symbol = ritem[rule_table[derives[i][j]].rhs];
+       int symbol = ritem[rules[derives[i][j]].rhs];

        if (ISVAR (symbol))
          SETBIT (FIRSTS (i), symbol - ntokens);
       }
        if (ISVAR (symbol))
          SETBIT (FIRSTS (i), symbol - ntokens);
       }


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

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

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