Fix some memory leaks, and fix a bug: state 0 was examined twice.

[bison.git] / src / output.c

diff --git a/src/output.c b/src/output.c
index 6de36ae22041230cc3254167f18419a43822b7ec..4a7a72653a7e97c1bd0226ef9f05f2a076b64a63 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -249,7 +249,7 @@ prepare_tokens (void)
           SYMBOL_TAG_GET uses slot 0.  */
        const char *cp =
          quotearg_n_style (1, c_quoting_style,
-                           symbol_tag_get (symbols[i]));
+                           symbols[i]->tag);
        /* Width of the next token, including the two quotes, the coma
           and the space.  */
        int strsize = strlen (cp) + 2;
@@ -430,7 +430,7 @@ action_row (state_t *state)
   int i;
   rule_number_t default_rule = 0;
   reductions_t *redp = state->reductions;
-  transitions_t *transitions = state->shifts;
+  transitions_t *transitions = state->transitions;
   errs_t *errp = state->errs;
   /* set nonzero to inhibit having any default reduction */
   int nodefault = 0;
@@ -442,19 +442,20 @@ action_row (state_t *state)
   if (redp->num >= 1)
     {
       int j;
+      bitset_iterator biter;
       /* loop over all the rules available here which require
         lookahead */
       for (i = state->nlookaheads - 1; i >= 0; --i)
        /* and find each token which the rule finds acceptable
           to come next */
-       BITSET_EXECUTE (state->lookaheads[i], 0, j,
+       BITSET_FOR_EACH (biter, state->lookaheads[i], j, 0)
        {
          /* and record this rule as the rule to use if that
             token follows.  */
          if (actrow[j] != 0)
            conflicted = conflrow[j] = 1;
          actrow[j] = -state->lookaheads_rule[i]->number;
-       });
+       }
     }
 
   /* Now see which tokens are allowed for shifts in this state.  For
@@ -745,7 +746,7 @@ symbol_destructors_output (FILE *out)
        fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
                 first ? "" : ",\n",
                 infile, symbol->destructor_location.first_line,
-                symbol_tag_get (symbol),
+                symbol->tag,
                 symbol->number,
                 symbol->destructor,
                 symbol->type_name);
@@ -778,7 +779,7 @@ symbol_printers_output (FILE *out)
        fprintf (out, "%s[[[%s]], [[%d]], [[%s]], [[%d]], [[%s]], [[%s]]]",
                 first ? "" : ",\n",
                 infile, symbol->printer_location.first_line,
-                symbol_tag_get (symbol),
+                symbol->tag,
                 symbol->number,
                 symbol->printer,
                 symbol->type_name);
@@ -1196,9 +1197,9 @@ m4_invoke (const char *definitions)
   if (!skel_in)
     error (EXIT_FAILURE, errno, "cannot run m4");
   skel_lex ();
-
 }
 
+
 /*---------------------------.
 | Call the skeleton parser.  |
 `---------------------------*/