Propagate more token_number_t.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 5a417d320f395dca180945f6806a974f3bf97101..ec5a12ad8fa60a37f0d3b80c6f2cc1a8d3903919 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,6 @@
 /* Print information on generated parser, for bison,
 /* Print information on generated parser, for bison,

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

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -33,9 +34,10 @@
 #include "print.h"
 #include "reduce.h"
 #include "closure.h"
 #include "print.h"
 #include "reduce.h"
 #include "closure.h"

+#include "bitset.h"

 
 

-static unsigned *shiftset = NULL;
-static unsigned *lookaheadset = NULL;
+static bitset shiftset;
+static bitset lookaheadset;

 
 #if 0
 static void
 
 #if 0
 static void


@@ -67,24 +69,24 @@ static void
 print_core (FILE *out, state_t *state)
 {
   int i;
 print_core (FILE *out, state_t *state)
 {
   int i;

-  short *sitems = state->items;
-  int snitems   = state->nitems;
+  item_number_t *sitems = state->items;
+  int snritems   = state->nitems;

 
   /* New experimental feature: if TRACE_FLAGS output all the items of
      a state, not only its kernel.  */
   if (trace_flag)
     {
 
   /* New experimental feature: if TRACE_FLAGS output all the items of
      a state, not only its kernel.  */
   if (trace_flag)
     {

-      closure (sitems, snitems);
+      closure (sitems, snritems);

       sitems = itemset;
       sitems = itemset;

-      snitems = nitemset;
+      snritems = nritemset;

     }
 
     }
 

-  if (snitems)
+  if (snritems)

     {
     {

-      for (i = 0; i < snitems; i++)
+      for (i = 0; i < snritems; i++)

        {
        {

-         short *sp;
-         short *sp1;
+         item_number_t *sp;
+         item_number_t *sp1;

          int rule;
 
          sp1 = sp = ritem + sitems[i];
          int rule;
 
          sp1 = sp = ritem + sitems[i];


@@ -93,9 +95,9 @@ print_core (FILE *out, state_t *state)
            sp++;
 
          rule = -(*sp);
            sp++;
 
          rule = -(*sp);

-         fprintf (out, "    %s  ->  ", escape (symbols[rules[rule].lhs]->tag));
+         fprintf (out, "    %s  ->  ", escape (rules[rule].lhs->tag));

 
 

-         for (sp = ritem + rules[rule].rhs; sp < sp1; sp++)
+         for (sp = rules[rule].rhs; sp < sp1; sp++)

            fprintf (out, "%s ", escape (symbols[*sp]->tag));
 
          fputc ('.', out);
            fprintf (out, "%s ", escape (symbols[*sp]->tag));
 
          fputc ('.', out);


@@ -122,7 +124,7 @@ print_shifts (FILE *out, state_t *state)
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
        int state1 = shiftp->shifts[i];
     if (!SHIFT_IS_DISABLED (shiftp, i))
       {
        int state1 = shiftp->shifts[i];

-       int symbol = state_table[state1]->accessing_symbol;
+       token_number_t symbol = states[state1]->accessing_symbol;

        fprintf (out,
                 _("    %-4s\tshift, and go to state %d\n"),
                 escape (symbols[symbol]->tag), state1);
        fprintf (out,
                 _("    %-4s\tshift, and go to state %d\n"),
                 escape (symbols[symbol]->tag), state1);


@@ -164,7 +166,7 @@ print_gotos (FILE *out, state_t *state)
        if (!SHIFT_IS_DISABLED (shiftp, i))
          {
            int state1 = shiftp->shifts[i];
        if (!SHIFT_IS_DISABLED (shiftp, i))
          {
            int state1 = shiftp->shifts[i];

-           int symbol = state_table[state1]->accessing_symbol;
+           token_number_t symbol = states[state1]->accessing_symbol;

            fprintf (out, _("    %-4s\tgo to state %d\n"),
                     escape (symbols[symbol]->tag), state1);
          }
            fprintf (out, _("    %-4s\tgo to state %d\n"),
                     escape (symbols[symbol]->tag), state1);
          }


@@ -188,14 +190,13 @@ print_reductions (FILE *out, state_t *state)
   if (state->consistent)
     {
       int rule = redp->rules[0];
   if (state->consistent)
     {
       int rule = redp->rules[0];

-      int symbol = rules[rule].lhs;
+      token_number_t symbol = rules[rule].lhs->number;

       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
               rule - 1, escape (symbols[symbol]->tag));
       return;
     }
 
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
               rule - 1, escape (symbols[symbol]->tag));
       return;
     }
 

-  for (i = 0; i < tokensetsize; i++)
-    shiftset[i] = 0;
+  bitset_zero (shiftset);

 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))
 
   for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
     if (!SHIFT_IS_DISABLED (shiftp, i))


@@ -204,113 +205,108 @@ print_reductions (FILE *out, state_t *state)
           default rule.  */
        if (SHIFT_IS_ERROR (shiftp, i))
          nodefault = 1;
           default rule.  */
        if (SHIFT_IS_ERROR (shiftp, i))
          nodefault = 1;

-       SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+       bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));

       }
 
   for (i = 0; i < errp->nerrs; i++)
     if (errp->errs[i])
       }
 
   for (i = 0; i < errp->nerrs; i++)
     if (errp->errs[i])

-      SETBIT (shiftset, errp->errs[i]);
+      bitset_set (shiftset, errp->errs[i]);

 
   if (state->nlookaheads == 1 && !nodefault)
     {
 
   if (state->nlookaheads == 1 && !nodefault)
     {

-      int k;
-      int default_rule = LAruleno[state->lookaheadsp];
+      rule_t *default_rule = LArule[state->lookaheadsp];

 
 

-      for (k = 0; k < tokensetsize; ++k)
-       lookaheadset[k] = LA (state->lookaheadsp)[k] & shiftset[k];
+      bitset_and (lookaheadset, LA[state->lookaheadsp], shiftset);

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

-       if (BITISSET (lookaheadset, i))
+       if (bitset_test (lookaheadset, i))

          fprintf (out, _("    %-4s\t[reduce using rule %d (%s)]\n"),
          fprintf (out, _("    %-4s\t[reduce using rule %d (%s)]\n"),

-                  escape (symbols[i]->tag), default_rule - 1,
-                  escape2 (symbols[rules[default_rule].lhs]->tag));
+                  escape (symbols[i]->tag),
+                  default_rule->number - 1,
+                  escape2 (default_rule->lhs->tag));

 
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
 
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),

-              default_rule - 1, escape (symbols[rules[default_rule].lhs]->tag));
+              default_rule->number - 1,
+              escape (default_rule->lhs->tag));

     }
   else if (state->nlookaheads >= 1)
     {
       int cmax = 0;
       int default_LA = -1;
     }
   else if (state->nlookaheads >= 1)
     {
       int cmax = 0;
       int default_LA = -1;

-      int default_rule = 0;
+      rule_t *default_rule = NULL;

 
       if (!nodefault)
        for (i = 0; i < state->nlookaheads; ++i)
          {
            int count = 0;
 
       if (!nodefault)
        for (i = 0; i < state->nlookaheads; ++i)
          {
            int count = 0;

-           int j, k;
+           int j;

 
 

-           for (k = 0; k < tokensetsize; ++k)
-             lookaheadset[k] = LA (state->lookaheadsp + i)[k] & ~shiftset[k];
+           bitset_andn (lookaheadset, LA[state->lookaheadsp + i], shiftset);

 
            for (j = 0; j < ntokens; j++)
 
            for (j = 0; j < ntokens; j++)

-             if (BITISSET (lookaheadset, j))
+             if (bitset_test (lookaheadset, j))

                count++;
 
            if (count > cmax)
              {
                cmax = count;
                default_LA = state->lookaheadsp + i;
                count++;
 
            if (count > cmax)
              {
                cmax = count;
                default_LA = state->lookaheadsp + i;

-               default_rule = LAruleno[state->lookaheadsp + i];
+               default_rule = LArule[state->lookaheadsp + i];

              }
 
              }
 

-           for (k = 0; k < tokensetsize; ++k)
-             shiftset[k] |= lookaheadset[k];
+           bitset_or (shiftset, shiftset, lookaheadset);

          }
 
          }
 

-      for (i = 0; i < tokensetsize; i++)
-       shiftset[i] = 0;
+      bitset_zero (shiftset);

 
       for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
        if (!SHIFT_IS_DISABLED (shiftp, i))
 
       for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++)
        if (!SHIFT_IS_DISABLED (shiftp, i))

-         SETBIT (shiftset, SHIFT_SYMBOL (shiftp, i));
+         bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i));

 
       for (i = 0; i < ntokens; i++)
        {
          int j;
          int defaulted = 0;
 
       for (i = 0; i < ntokens; i++)
        {
          int j;
          int defaulted = 0;

-         int count = BITISSET (shiftset, i);
+         int count = bitset_test (shiftset, i);

 
          for (j = 0; j < state->nlookaheads; ++j)
 
          for (j = 0; j < state->nlookaheads; ++j)

-           {
-             if (BITISSET (LA (state->lookaheadsp + j), i))
-               {
-                 if (count == 0)
-                   {
-                     if (state->lookaheadsp + j != default_LA)
-                       fprintf (out,
-                                _("    %-4s\treduce using rule %d (%s)\n"),
-                                escape (symbols[i]->tag),
-                                LAruleno[state->lookaheadsp + j] - 1,
-                                escape2 (symbols[rules[LAruleno[state->lookaheadsp + j]].lhs]->tag));
-                     else
-                       defaulted = 1;
-
-                     count++;
-                   }
-                 else
-                   {
-                     if (defaulted)
-                       fprintf (out,
-                                _("    %-4s\treduce using rule %d (%s)\n"),
-                                escape (symbols[i]->tag),
-                                LAruleno[default_LA] - 1,
-                                escape2 (symbols[rules[LAruleno[default_LA]].lhs]->tag));
-                     defaulted = 0;
+           if (bitset_test (LA[state->lookaheadsp + j], i))
+             {
+               if (count == 0)
+                 {
+                   if (state->lookaheadsp + j != default_LA)

                      fprintf (out,
                      fprintf (out,

-                              _("    %-4s\t[reduce using rule %d (%s)]\n"),
+                              _("    %-4s\treduce using rule %d (%s)\n"),

                               escape (symbols[i]->tag),
                               escape (symbols[i]->tag),

-                              LAruleno[state->lookaheadsp + j] - 1,
-                              escape2 (symbols[rules[LAruleno[state->lookaheadsp + j]].lhs]->tag));
-                   }
-               }
-           }
+                              LArule[state->lookaheadsp + j]->number - 1,
+                              escape2 (LArule[state->lookaheadsp + j]->lhs->tag));
+                   else
+                     defaulted = 1;
+
+                   count++;
+                 }
+               else
+                 {
+                   if (defaulted)
+                     fprintf (out,
+                              _("    %-4s\treduce using rule %d (%s)\n"),
+                              escape (symbols[i]->tag),
+                              LArule[default_LA]->number - 1,
+                              escape2 (LArule[default_LA]->lhs->tag));
+                   defaulted = 0;
+                   fprintf (out,
+                            _("    %-4s\t[reduce using rule %d (%s)]\n"),
+                            escape (symbols[i]->tag),
+                            LArule[state->lookaheadsp + j]->number - 1,
+                            escape2 (LArule[state->lookaheadsp + j]->lhs->tag));
+                 }
+             }

        }
 
       if (default_LA >= 0)
        fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
        }
 
       if (default_LA >= 0)
        fprintf (out, _("    $default\treduce using rule %d (%s)\n"),

-                default_rule - 1,
-                escape (symbols[rules[default_rule].lhs]->tag));
+                default_rule->number - 1,
+                escape (default_rule->lhs->tag));

     }
 }
 
     }
 }
 


@@ -364,35 +360,34 @@ do {                                              \
 static void
 print_grammar (FILE *out)
 {
 static void
 print_grammar (FILE *out)
 {

-  int i, j;
-  short *rule;
+  token_number_t i;
+  int j;
+  item_number_t *rule;

   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */
   fprintf (out, "%s\n\n", _("Grammar"));
   fprintf (out, "  %s\n", _("Number, Line, Rule"));
   char buffer[90];
   int column = 0;
 
   /* rule # : LHS -> RHS */
   fprintf (out, "%s\n\n", _("Grammar"));
   fprintf (out, "  %s\n", _("Number, Line, Rule"));

-  for (i = 1; i <= nrules; i++)
-    /* Don't print rules disabled in reduce_grammar_tables.  */
-    if (rules[i].useful)
-      {
-       fprintf (out, _("  %3d %3d %s ->"),
-                i - 1, rules[i].line, escape (symbols[rules[i].lhs]->tag));
-       rule = &ritem[rules[i].rhs];
-       if (*rule >= 0)
-         while (*rule >= 0)
-           fprintf (out, " %s", escape (symbols[*rule++]->tag));
-       else
-         fprintf (out, " /* %s */", _("empty"));
-       fputc ('\n', out);
-      }
+  for (j = 1; j < nrules + 1; j++)
+    {
+      fprintf (out, _("  %3d %3d %s ->"),
+              j - 1, rules[j].line, escape (rules[j].lhs->tag));
+      rule = rules[j].rhs;
+      if (*rule >= 0)
+       while (*rule >= 0)
+         fprintf (out, " %s", escape (symbols[*rule++]->tag));
+      else
+       fprintf (out, " /* %s */", _("empty"));
+      fputc ('\n', out);
+    }

   fputs ("\n\n", out);
 
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
   fputs ("\n\n", out);
 
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
   fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));

-  for (i = 0; i <= max_user_token_number; i++)
-    if (token_translations[i] != 2)
+  for (i = 0; i < max_user_token_number + 1; i++)
+    if (token_translations[i] != undeftoken->number)

       {
        buffer[0] = 0;
        column = strlen (escape (symbols[token_translations[i]]->tag));
       {
        buffer[0] = 0;
        column = strlen (escape (symbols[token_translations[i]]->tag));


@@ -400,9 +395,9 @@ print_grammar (FILE *out)
        END_TEST (50);
        sprintf (buffer, " (%d)", i);
 
        END_TEST (50);
        sprintf (buffer, " (%d)", i);
 

-       for (j = 1; j <= nrules; j++)
-         for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
-           if (*rule == token_translations[i])
+       for (j = 1; j < nrules + 1; j++)
+         for (rule = rules[j].rhs; *rule >= 0; rule++)
+           if (item_number_as_token_number (*rule) == token_translations[i])

              {
                END_TEST (65);
                sprintf (buffer + strlen (buffer), " %d", j - 1);
              {
                END_TEST (65);
                sprintf (buffer + strlen (buffer), " %d", j - 1);


@@ -414,16 +409,16 @@ print_grammar (FILE *out)
 
 
   fprintf (out, "%s\n\n", _("Nonterminals, with rules where they appear"));
 
 
   fprintf (out, "%s\n\n", _("Nonterminals, with rules where they appear"));

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

     {
       int left_count = 0, right_count = 0;
 
     {
       int left_count = 0, right_count = 0;
 

-      for (j = 1; j <= nrules; j++)
+      for (j = 1; j < nrules + 1; j++)

        {
        {

-         if (rules[j].lhs == i)
+         if (rules[j].lhs->number == i)

            left_count++;
            left_count++;

-         for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
-           if (*rule == i)
+         for (rule = rules[j].rhs; *rule >= 0; rule++)
+           if (item_number_as_token_number (*rule) == i)

              {
                right_count++;
                break;
              {
                right_count++;
                break;


@@ -441,10 +436,10 @@ print_grammar (FILE *out)
          END_TEST (50);
          sprintf (buffer + strlen (buffer), _(" on left:"));
 
          END_TEST (50);
          sprintf (buffer + strlen (buffer), _(" on left:"));
 

-         for (j = 1; j <= nrules; j++)
+         for (j = 1; j < nrules + 1; j++)

            {
              END_TEST (65);
            {
              END_TEST (65);

-             if (rules[j].lhs == i)
+             if (rules[j].lhs->number == i)

                sprintf (buffer + strlen (buffer), " %d", j - 1);
            }
        }
                sprintf (buffer + strlen (buffer), " %d", j - 1);
            }
        }


@@ -455,10 +450,10 @@ print_grammar (FILE *out)
            sprintf (buffer + strlen (buffer), ",");
          END_TEST (50);
          sprintf (buffer + strlen (buffer), _(" on right:"));
            sprintf (buffer + strlen (buffer), ",");
          END_TEST (50);
          sprintf (buffer + strlen (buffer), _(" on right:"));

-         for (j = 1; j <= nrules; j++)
+         for (j = 1; j < nrules + 1; j++)

            {
            {

-             for (rule = &ritem[rules[j].rhs]; *rule >= 0; rule++)
-               if (*rule == i)
+             for (rule = rules[j].rhs; *rule >= 0; rule++)
+               if (item_number_as_token_number (*rule) == i)

                  {
                    END_TEST (65);
                    sprintf (buffer + strlen (buffer), " %d", j - 1);
                  {
                    END_TEST (65);
                    sprintf (buffer + strlen (buffer), " %d", j - 1);


@@ -474,7 +469,7 @@ print_grammar (FILE *out)
 void
 print_results (void)
 {
 void
 print_results (void)
 {

-  int i;
+  size_t i;

 
   /* We used to use just .out if SPEC_NAME_PREFIX (-p) was used, but
      that conflicts with Posix.  */
 
   /* We used to use just .out if SPEC_NAME_PREFIX (-p) was used, but
      that conflicts with Posix.  */


@@ -498,12 +493,12 @@ print_results (void)
   if (trace_flag)
     new_closure (nritems);
   /* Storage for print_reductions.  */
   if (trace_flag)
     new_closure (nritems);
   /* Storage for print_reductions.  */

-  shiftset = XCALLOC (unsigned, tokensetsize);
-  lookaheadset = XCALLOC (unsigned, tokensetsize);
+  shiftset =  bitset_create (ntokens, BITSET_FIXED);
+  lookaheadset = bitset_create (ntokens, BITSET_FIXED);

   for (i = 0; i < nstates; i++)
   for (i = 0; i < nstates; i++)

-    print_state (out, state_table[i]);
-  free (shiftset);
-  free (lookaheadset);
+    print_state (out, states[i]);
+  bitset_free (shiftset);
+  bitset_free (lookaheadset);

   if (trace_flag)
     free_closure ();
 
   if (trace_flag)
     free_closure ();