* src/bison.simple: Remove YYERROR_VERBOSE using.

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 418b1072f799635b8cd5465200a3e85d311d3e63..b6bacb94cde8d4e9444eb43f6e57e49d540e2c92 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,5 +1,5 @@
 /* Find and resolve or report look-ahead conflicts for bison,
 /* Find and resolve or report look-ahead conflicts for bison,

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

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


@@ -19,51 +19,32 @@
    02111-1307, USA.  */
 
 #include "system.h"
    02111-1307, USA.  */
 
 #include "system.h"

+#include "complain.h"

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

-#include "alloc.h"

 #include "files.h"
 #include "gram.h"
 #include "state.h"
 #include "files.h"
 #include "gram.h"
 #include "state.h"

-
-
-extern char **tags;
-extern int tokensetsize;
-extern char *consistent;
-extern short *accessing_symbol;
-extern shifts **shift_table;
-extern unsigned *LA;
-extern short *LAruleno;
-extern short *lookaheads;
-extern int fixed_outfiles;
-
-extern void initialize_conflicts PARAMS ((void));
-extern void conflict_log PARAMS ((void));
-extern void verbose_conflict_log PARAMS ((void));
-extern void print_reductions PARAMS ((int));
-extern void finalize_conflicts PARAMS ((void));
-
-char any_conflicts;
-errs **err_table;
-int expected_conflicts;
-static char *conflicts;
-
-
-static unsigned *shiftset;
-static unsigned *lookaheadset;
-static int src_total;
-static int rrc_total;
-static int src_count;
-static int rrc_count;
+#include "lalr.h"
+#include "conflicts.h"
+#include "reader.h"
+#include "LR0.h"
+
+errs **err_table = NULL;
+/* -1 stands for not specified. */
+int expected_conflicts = -1;
+static char *conflicts = NULL;
+
+static unsigned *shiftset = NULL;
+static unsigned *lookaheadset = NULL;

 \f
 
 static inline void
 log_resolution (int state, int LAno, int token, char *resolution)
 {
 \f
 
 static inline void
 log_resolution (int state, int LAno, int token, char *resolution)
 {

-  if (verboseflag)
-    fprintf (foutput,
-            _("\
+  obstack_fgrow4 (&output_obstack,
+                 _("\

 Conflict in state %d between rule %d and token %s resolved as %s.\n"),
 Conflict in state %d between rule %d and token %s resolved as %s.\n"),

-            state, LAruleno[LAno], tags[token], resolution);
+                 state, LAruleno[LAno], tags[token], resolution);

 }
 
 
 }
 
 


@@ -79,7 +60,7 @@ flush_shift (int state, int token)
   shifts *shiftp;
   int k, i;
 
   shifts *shiftp;
   int k, i;
 

-  shiftp = shift_table[state];
+  shiftp = state_table[state].shift_table;

 
   if (shiftp)
     {
 
   if (shiftp)
     {


@@ -87,7 +68,7 @@ flush_shift (int state, int token)
       for (i = 0; i < k; i++)
        {
          if (shiftp->shifts[i]
       for (i = 0; i < k; i++)
        {
          if (shiftp->shifts[i]

-             && token == accessing_symbol[shiftp->shifts[i]])
+             && token == state_table[shiftp->shifts[i]].accessing_symbol)

            (shiftp->shifts[i]) = 0;
        }
     }
            (shiftp->shifts[i]) = 0;
        }
     }


@@ -109,14 +90,14 @@ resolve_sr_conflict (int state, int lookaheadnum)
   unsigned *fp1;
   unsigned *fp2;
   int redprec;
   unsigned *fp1;
   unsigned *fp2;
   int redprec;

-  errs *errp = (errs *) xmalloc (sizeof (errs) + ntokens * sizeof (short));
+  errs *errp = ERRS_ALLOC (ntokens + 1);

   short *errtokens = errp->errs;
 
   /* find the rule to reduce by to get precedence of reduction  */
   short *errtokens = errp->errs;
 
   /* find the rule to reduce by to get precedence of reduction  */

-  redprec = rprec[LAruleno[lookaheadnum]];
+  redprec = rule_table[LAruleno[lookaheadnum]].prec;

 
   mask = 1;
 
   mask = 1;

-  fp1 = LA + lookaheadnum * tokensetsize;
+  fp1 = LA (lookaheadnum);

   fp2 = lookaheadset;
   for (i = 0; i < ntokens; i++)
     {
   fp2 = lookaheadset;
   for (i = 0; i < ntokens; i++)
     {


@@ -145,29 +126,29 @@ resolve_sr_conflict (int state, int lookaheadnum)
 
              switch (sassoc[i])
                {
 
              switch (sassoc[i])
                {

-               case RIGHT_ASSOC:
+               case right_assoc:

                  log_resolution (state, lookaheadnum, i, _("shift"));
                  break;
 
                  log_resolution (state, lookaheadnum, i, _("shift"));
                  break;
 

-               case LEFT_ASSOC:
+               case left_assoc:

                  log_resolution (state, lookaheadnum, i, _("reduce"));
                  break;
 
                  log_resolution (state, lookaheadnum, i, _("reduce"));
                  break;
 

-               case NON_ASSOC:
+               case non_assoc:

                  log_resolution (state, lookaheadnum, i, _("an error"));
                  break;
                }
 
                  log_resolution (state, lookaheadnum, i, _("an error"));
                  break;
                }
 

-             if (sassoc[i] != RIGHT_ASSOC)
+             if (sassoc[i] != right_assoc)

                {
                  *fp2 &= ~mask;        /* flush the shift for this token */
                  flush_shift (state, i);
                }
                {
                  *fp2 &= ~mask;        /* flush the shift for this token */
                  flush_shift (state, i);
                }

-             if (sassoc[i] != LEFT_ASSOC)
+             if (sassoc[i] != left_assoc)

                {
                  *fp1 &= ~mask;        /* flush the reduce for this token */
                }
                {
                  *fp1 &= ~mask;        /* flush the reduce for this token */
                }

-             if (sassoc[i] == NON_ASSOC)
+             if (sassoc[i] == non_assoc)

                {
                  /* Record an explicit error for this token.  */
                  *errtokens++ = i;
                {
                  /* Record an explicit error for this token.  */
                  *errtokens++ = i;


@@ -189,7 +170,7 @@ resolve_sr_conflict (int state, int lookaheadnum)
       /* Some tokens have been explicitly made errors.  Allocate
          a permanent errs structure for this state, to record them.  */
       i = (char *) errtokens - (char *) errp;
       /* Some tokens have been explicitly made errors.  Allocate
          a permanent errs structure for this state, to record them.  */
       i = (char *) errtokens - (char *) errp;

-      err_table[state] = (errs *) xmalloc ((unsigned int) i);
+      err_table[state] = ERRS_ALLOC (i + 1);

       bcopy (errp, err_table[state], i);
     }
   else
       bcopy (errp, err_table[state], i);
     }
   else


@@ -201,114 +182,77 @@ resolve_sr_conflict (int state, int lookaheadnum)
 static void
 set_conflicts (int state)
 {
 static void
 set_conflicts (int state)
 {

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

   shifts *shiftp;
   shifts *shiftp;

-  unsigned *fp2;
-  unsigned *fp3;
-  unsigned *fp4;
-  unsigned *fp1;

   int symbol;
 
   int symbol;
 

-  if (consistent[state])
+  if (state_table[state].consistent)

     return;
 
   for (i = 0; i < tokensetsize; i++)
     lookaheadset[i] = 0;
 
     return;
 
   for (i = 0; i < tokensetsize; i++)
     lookaheadset[i] = 0;
 

-  shiftp = shift_table[state];
+  shiftp = state_table[state].shift_table;

   if (shiftp)
   if (shiftp)

-    {
-      k = shiftp->nshifts;
-      for (i = 0; i < k; i++)
-       {
-         symbol = accessing_symbol[shiftp->shifts[i]];
-         if (ISVAR (symbol))
-           break;
-         SETBIT (lookaheadset, symbol);
-       }
-    }
-
-  k = lookaheads[state + 1];
-  fp4 = lookaheadset + tokensetsize;
+    for (i = 0; i < shiftp->nshifts; i++)
+      {
+       symbol = state_table[shiftp->shifts[i]].accessing_symbol;
+       if (ISVAR (symbol))
+         break;
+       SETBIT (lookaheadset, symbol);
+      }

 
   /* Loop over all rules which require lookahead in this state.  First
      check for shift-reduce conflict, and try to resolve using
      precedence */
 
   /* Loop over all rules which require lookahead in this state.  First
      check for shift-reduce conflict, and try to resolve using
      precedence */

-  for (i = lookaheads[state]; i < k; i++)
-    if (rprec[LAruleno[i]])
-      {
-       fp1 = LA + i * tokensetsize;
-       fp2 = fp1;
-       fp3 = lookaheadset;
-
-       while (fp3 < fp4)
+  for (i = state_table[state].lookaheads;
+       i < state_table[state + 1].lookaheads;
+       ++i)
+    if (rule_table[LAruleno[i]].prec)
+      for (j = 0; j < tokensetsize; ++j)
+       if (LA (i)[j] & lookaheadset[j])

          {
          {

-           if (*fp2++ & *fp3++)
-             {
-               resolve_sr_conflict (state, i);
-               break;
-             }
+           resolve_sr_conflict (state, i);
+           break;

          }
          }

-      }

 
 
   /* Loop over all rules which require lookahead in this state.  Check
      for conflicts not resolved above.  */
 
 
   /* Loop over all rules which require lookahead in this state.  Check
      for conflicts not resolved above.  */

-  for (i = lookaheads[state]; i < k; i++)
+  for (i = state_table[state].lookaheads;
+       i < state_table[state + 1].lookaheads;
+       ++i)

     {
     {

-      fp1 = LA + i * tokensetsize;
-      fp2 = fp1;
-      fp3 = lookaheadset;
-
-      while (fp3 < fp4)
-       {
-         if (*fp2++ & *fp3++)
-           {
-             conflicts[state] = 1;
-             any_conflicts = 1;
-           }
-       }
+      for (j = 0; j < tokensetsize; ++j)
+       if (LA (i)[j] & lookaheadset[j])
+         conflicts[state] = 1;

 
 

-      fp2 = fp1;
-      fp3 = lookaheadset;
-
-      while (fp3 < fp4)
-       *fp3++ |= *fp2++;
+      for (j = 0; j < tokensetsize; ++j)
+       lookaheadset[j] |= LA (i)[j];

     }
 }
 
 void
     }
 }
 
 void

-initialize_conflicts (void)
+solve_conflicts (void)

 {
   int i;
 {
   int i;

-/*  errs *sp; JF unused */
-
-  conflicts = NEW2 (nstates, char);
-  shiftset = NEW2 (tokensetsize, unsigned);
-  lookaheadset = NEW2 (tokensetsize, unsigned);

 
 

-  err_table = NEW2 (nstates, errs *);
+  conflicts = XCALLOC (char, nstates);
+  shiftset = XCALLOC (unsigned, tokensetsize);
+  lookaheadset = XCALLOC (unsigned, tokensetsize);

 
 

-  any_conflicts = 0;
+  err_table = XCALLOC (errs *, nstates);

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

-
-
-
-
-
-
-

 /*---------------------------------------------.
 | Count the number of shift/reduce conflicts.  |
 `---------------------------------------------*/
 
 /*---------------------------------------------.
 | Count the number of shift/reduce conflicts.  |
 `---------------------------------------------*/
 

-static void
+static int

 count_sr_conflicts (int state)
 {
   int i;
 count_sr_conflicts (int state)
 {
   int i;


@@ -320,11 +264,11 @@ count_sr_conflicts (int state)
   unsigned *fp3;
   int symbol;
 
   unsigned *fp3;
   int symbol;
 

-  src_count = 0;
+  int src_count = 0;

 
 

-  shiftp = shift_table[state];
+  shiftp = state_table[state].shift_table;

   if (!shiftp)
   if (!shiftp)

-    return;
+    return 0;

 
   for (i = 0; i < tokensetsize; i++)
     {
 
   for (i = 0; i < tokensetsize; i++)
     {


@@ -337,18 +281,18 @@ count_sr_conflicts (int state)
     {
       if (!shiftp->shifts[i])
        continue;
     {
       if (!shiftp->shifts[i])
        continue;

-      symbol = accessing_symbol[shiftp->shifts[i]];
+      symbol = state_table[shiftp->shifts[i]].accessing_symbol;

       if (ISVAR (symbol))
        break;
       SETBIT (shiftset, symbol);
     }
 
       if (ISVAR (symbol))
        break;
       SETBIT (shiftset, symbol);
     }
 

-  k = lookaheads[state + 1];
+  k = state_table[state + 1].lookaheads;

   fp3 = lookaheadset + tokensetsize;
 
   fp3 = lookaheadset + tokensetsize;
 

-  for (i = lookaheads[state]; i < k; i++)
+  for (i = state_table[state].lookaheads; i < k; i++)

     {
     {

-      fp1 = LA + i * tokensetsize;
+      fp1 = LA (i);

       fp2 = lookaheadset;
 
       while (fp2 < fp3)
       fp2 = lookaheadset;
 
       while (fp2 < fp3)


@@ -375,6 +319,8 @@ count_sr_conflicts (int state)
          fp2++;
        }
     }
          fp2++;
        }
     }

+
+  return src_count;

 }
 
 
 }
 
 


@@ -382,33 +328,29 @@ count_sr_conflicts (int state)
 | Count the number of reduce/reduce conflicts.  |
 `----------------------------------------------*/
 
 | Count the number of reduce/reduce conflicts.  |
 `----------------------------------------------*/
 

-static void
+static int

 count_rr_conflicts (int state)
 {
   int i;
 count_rr_conflicts (int state)
 {
   int i;

-  int j;
-  int count;

   unsigned mask;
   unsigned *baseword;
   unsigned mask;
   unsigned *baseword;

-  unsigned *wordp;
-  int m;
-  int n;

 
 

-  rrc_count = 0;
+  int rrc_count = 0;

 
 

-  m = lookaheads[state];
-  n = lookaheads[state + 1];
+  int m = state_table[state].lookaheads;
+  int n = state_table[state + 1].lookaheads;

 
   if (n - m < 2)
 
   if (n - m < 2)

-    return;
+    return 0;

 
   mask = 1;
 
   mask = 1;

-  baseword = LA + m * tokensetsize;
+  baseword = LA (m);

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

-      wordp = baseword;
+      unsigned *wordp = baseword;

 
 

-      count = 0;
+      int count = 0;
+      int j;

       for (j = m; j < n; j++)
        {
          if (mask & *wordp)
       for (j = m; j < n; j++)
        {
          if (mask & *wordp)


@@ -427,128 +369,132 @@ count_rr_conflicts (int state)
          baseword++;
        }
     }
          baseword++;
        }
     }

+
+  return rrc_count;

 }
 
 }
 

-/*------------------------------------.
-| Give a report about the conflicts.  |
-`------------------------------------*/
+/*--------------------------------------------------------------.
+| Return a human readable string which reports shift/reduce and |
+| reduce/reduce conflict numbers (SRC_NUM, RRC_NUM).            |
+`--------------------------------------------------------------*/

 
 

-static void
-total_conflicts (void)
+static const char *
+conflict_report (int src_num, int rrc_num)

 {
 {

-  if (src_total == expected_conflicts && rrc_total == 0)
-    return;
+  static char res[4096];
+  char *cp = res;

 
 

-  if (fixed_outfiles)
+  if (src_num >= 1)

     {
     {

-      /* If invoked under the name `yacc', use the output format
-         specified by POSIX.  */
-      fprintf (stderr, _("conflicts: "));
-      if (src_total > 0)
-       fprintf (stderr, _(" %d shift/reduce"), src_total);
-      if (src_total > 0 && rrc_total > 0)
-       fprintf (stderr, ",");
-      if (rrc_total > 0)
-       fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
-      putc ('\n', stderr);
+      sprintf (cp, ngettext ("%d shift/reduce conflict",
+                            "%d shift/reduce conflicts", src_num), src_num);
+      cp += strlen (cp);

     }
     }

-  else
-    {
-      fprintf (stderr, _("%s contains"), infile);

 
 

-      if (src_total == 1)
-       fprintf (stderr, _(" 1 shift/reduce conflict"));
-      else if (src_total > 1)
-       fprintf (stderr, _(" %d shift/reduce conflicts"), src_total);
+  if (src_num > 0 && rrc_num > 0)
+    {
+      sprintf (cp, " %s ", _("and"));
+      cp += strlen (cp);
+    }

 
 

-      if (src_total > 0 && rrc_total > 0)
-       fprintf (stderr, _(" and"));
+  if (rrc_num >= 1)
+    {
+      sprintf (cp, ngettext ("%d reduce/reduce conflict",
+                            "%d reduce/reduce conflicts", rrc_num), rrc_num);
+      cp += strlen (cp);
+    }

 
 

-      if (rrc_total == 1)
-       fprintf (stderr, _(" 1 reduce/reduce conflict"));
-      else if (rrc_total > 1)
-       fprintf (stderr, _(" %d reduce/reduce conflicts"), rrc_total);
+  *cp++ = '.';
+  *cp++ = '\n';
+  *cp++ = '\0';

 
 

-      putc ('.', stderr);
-      putc ('\n', stderr);
-    }
+  return res;

 }
 
 
 }
 
 

-/*---------------------------------------------.
-| Compute and give a report on the conflicts.  |
-`---------------------------------------------*/
+/*-----------------------------------------------------------.
+| Output the detailed description of states with conflicts.  |
+`-----------------------------------------------------------*/

 
 void
 
 void

-conflict_log (void)
+conflicts_output (FILE *out)

 {
   int i;
 {
   int i;

-
-  src_total = 0;
-  rrc_total = 0;
-

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

-    {
-      if (conflicts[i])
-       {
-         count_sr_conflicts (i);
-         count_rr_conflicts (i);
-         src_total += src_count;
-         rrc_total += rrc_count;
-       }
-    }
-
-  total_conflicts ();
+    if (conflicts[i])
+      {
+       fprintf (out, _("State %d contains "), i);
+       fputs (conflict_report (count_sr_conflicts (i),
+                               count_rr_conflicts (i)), out);
+      }

 }
 
 
 }
 
 

+/*------------------------------------------.
+| Reporting the total number of conflicts.  |
+`------------------------------------------*/
+

 void
 void

-verbose_conflict_log (void)
+conflicts_print (void)

 {
   int i;
 
 {
   int i;
 

-  src_total = 0;
-  rrc_total = 0;
+  /* Is the number of SR conflicts OK?  Either EXPECTED_CONFLICTS is
+     not set, and then we want 0 SR, or else it is specified, in which
+     case we want equality.  */
+  int src_ok = 0;

 
 

-  for (i = 0; i < nstates; i++)
-    {
-      if (conflicts[i])
-       {
-         count_sr_conflicts (i);
-         count_rr_conflicts (i);
-         src_total += src_count;
-         rrc_total += rrc_count;
-
-         fprintf (foutput, _("State %d contains"), i);
+  int src_total = 0;
+  int rrc_total = 0;

 
 

-         if (src_count == 1)
-           fprintf (foutput, _(" 1 shift/reduce conflict"));
-         else if (src_count > 1)
-           fprintf (foutput, _(" %d shift/reduce conflicts"), src_count);
+  /* Conflicts by state.  */
+  for (i = 0; i < nstates; i++)
+    if (conflicts[i])
+      {
+       src_total += count_sr_conflicts (i);
+       rrc_total += count_rr_conflicts (i);
+      }

 
 

-         if (src_count > 0 && rrc_count > 0)
-           fprintf (foutput, _(" and"));
+  src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts);

 
 

-         if (rrc_count == 1)
-           fprintf (foutput, _(" 1 reduce/reduce conflict"));
-         else if (rrc_count > 1)
-           fprintf (foutput, _(" %d reduce/reduce conflicts"), rrc_count);
+  /* If there are no RR conflicts, and as many SR conflicts as
+     expected, then there is nothing to report.  */
+  if (!rrc_total && src_ok)
+    return;

 
 

-         putc ('.', foutput);
-         putc ('\n', foutput);
-       }
+  /* Report the total number of conflicts on STDERR.  */
+  if (yacc_flag)
+    {
+      /* If invoked with `--yacc', use the output format specified by
+        POSIX.  */
+      fprintf (stderr, _("conflicts: "));
+      if (src_total > 0)
+       fprintf (stderr, _(" %d shift/reduce"), src_total);
+      if (src_total > 0 && rrc_total > 0)
+       fprintf (stderr, ",");
+      if (rrc_total > 0)
+       fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
+      putc ('\n', stderr);
+    }
+  else
+    {
+      fprintf (stderr, _("%s contains "), infile);
+      fputs (conflict_report (src_total, rrc_total), stderr);

     }
 
     }
 

-  total_conflicts ();
+  if (expected_conflicts != -1 && !src_ok)
+    {
+      complain_message_count++;
+      fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n",
+                                "expected %d shift/reduce conflicts\n",
+                                expected_conflicts),
+              expected_conflicts);
+    }

 }
 
 
 }
 
 

-
-
-
-

 void
 void

-print_reductions (int state)
+print_reductions (FILE *out, int state)

 {
   int i;
   int j;
 {
   int i;
   int j;


@@ -573,7 +519,7 @@ print_reductions (int state)
   for (i = 0; i < tokensetsize; i++)
     shiftset[i] = 0;
 
   for (i = 0; i < tokensetsize; i++)
     shiftset[i] = 0;
 

-  shiftp = shift_table[state];
+  shiftp = state_table[state].shift_table;

   if (shiftp)
     {
       k = shiftp->nshifts;
   if (shiftp)
     {
       k = shiftp->nshifts;


@@ -581,7 +527,7 @@ print_reductions (int state)
        {
          if (!shiftp->shifts[i])
            continue;
        {
          if (!shiftp->shifts[i])
            continue;

-         symbol = accessing_symbol[shiftp->shifts[i]];
+         symbol = state_table[shiftp->shifts[i]].accessing_symbol;

          if (ISVAR (symbol))
            break;
          /* if this state has a shift for the error token,
          if (ISVAR (symbol))
            break;
          /* if this state has a shift for the error token,


@@ -605,14 +551,14 @@ print_reductions (int state)
        }
     }
 
        }
     }
 

-  m = lookaheads[state];
-  n = lookaheads[state + 1];
+  m = state_table[state].lookaheads;
+  n = state_table[state + 1].lookaheads;

 
   if (n - m == 1 && !nodefault)
     {
       default_rule = LAruleno[m];
 
 
   if (n - m == 1 && !nodefault)
     {
       default_rule = LAruleno[m];
 

-      fp1 = LA + m * tokensetsize;
+      fp1 = LA (m);

       fp2 = shiftset;
       fp3 = lookaheadset;
       fp4 = lookaheadset + tokensetsize;
       fp2 = shiftset;
       fp3 = lookaheadset;
       fp4 = lookaheadset + tokensetsize;


@@ -626,8 +572,9 @@ print_reductions (int state)
       for (i = 0; i < ntokens; i++)
        {
          if (mask & *fp3)
       for (i = 0; i < ntokens; i++)
        {
          if (mask & *fp3)

-           fprintf (foutput, _("    %-4s\t[reduce using rule %d (%s)]\n"),
-                    tags[i], default_rule, tags[rlhs[default_rule]]);
+           fprintf (out, _("    %-4s\t[reduce using rule %d (%s)]\n"),
+                    tags[i], default_rule,
+                    tags[rule_table[default_rule].lhs]);

 
          mask <<= 1;
          if (mask == 0)
 
          mask <<= 1;
          if (mask == 0)


@@ -637,8 +584,8 @@ print_reductions (int state)
            }
        }
 
            }
        }
 

-      fprintf (foutput, _("    $default\treduce using rule %d (%s)\n\n"),
-              default_rule, tags[rlhs[default_rule]]);
+      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
+              default_rule, tags[rule_table[default_rule].lhs]);

     }
   else if (n - m >= 1)
     {
     }
   else if (n - m >= 1)
     {


@@ -649,7 +596,7 @@ print_reductions (int state)
       if (!nodefault)
        for (i = m; i < n; i++)
          {
       if (!nodefault)
        for (i = m; i < n; i++)
          {

-           fp1 = LA + i * tokensetsize;
+           fp1 = LA (i);

            fp2 = shiftset;
            fp3 = lookaheadset;
 
            fp2 = shiftset;
            fp3 = lookaheadset;
 


@@ -696,7 +643,7 @@ print_reductions (int state)
            {
              if (!shiftp->shifts[i])
                continue;
            {
              if (!shiftp->shifts[i])
                continue;

-             symbol = accessing_symbol[shiftp->shifts[i]];
+             symbol = state_table[shiftp->shifts[i]].accessing_symbol;

              if (ISVAR (symbol))
                break;
              SETBIT (shiftset, symbol);
              if (ISVAR (symbol))
                break;
              SETBIT (shiftset, symbol);


@@ -704,7 +651,7 @@ print_reductions (int state)
        }
 
       mask = 1;
        }
 
       mask = 1;

-      fp1 = LA + m * tokensetsize;
+      fp1 = LA (m);

       fp2 = shiftset;
       for (i = 0; i < ntokens; i++)
        {
       fp2 = shiftset;
       for (i = 0; i < ntokens; i++)
        {


@@ -725,9 +672,9 @@ print_reductions (int state)
                      if (j != default_LA)
                        {
                          rule = LAruleno[j];
                      if (j != default_LA)
                        {
                          rule = LAruleno[j];

-                         fprintf (foutput,
+                         fprintf (out,

                                   _("    %-4s\treduce using rule %d (%s)\n"),
                                   _("    %-4s\treduce using rule %d (%s)\n"),

-                                  tags[i], rule, tags[rlhs[rule]]);
+                                  tags[i], rule, tags[rule_table[rule].lhs]);

                        }
                      else
                        defaulted = 1;
                        }
                      else
                        defaulted = 1;


@@ -739,15 +686,15 @@ print_reductions (int state)
                      if (defaulted)
                        {
                          rule = LAruleno[default_LA];
                      if (defaulted)
                        {
                          rule = LAruleno[default_LA];

-                         fprintf (foutput,
+                         fprintf (out,

                                   _("    %-4s\treduce using rule %d (%s)\n"),
                                   _("    %-4s\treduce using rule %d (%s)\n"),

-                                  tags[i], rule, tags[rlhs[rule]]);
+                                  tags[i], rule, tags[rule_table[rule].lhs]);

                          defaulted = 0;
                        }
                      rule = LAruleno[j];
                          defaulted = 0;
                        }
                      rule = LAruleno[j];

-                     fprintf (foutput,
+                     fprintf (out,

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

-                              tags[i], rule, tags[rlhs[rule]]);
+                              tags[i], rule, tags[rule_table[rule].lhs]);

                    }
                }
 
                    }
                }
 


@@ -766,20 +713,16 @@ print_reductions (int state)
        }
 
       if (default_LA >= 0)
        }
 
       if (default_LA >= 0)

-       {
-         fprintf (foutput, _("    $default\treduce using rule %d (%s)\n"),
-                  default_rule, tags[rlhs[default_rule]]);
-       }
-
-      putc ('\n', foutput);
+       fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
+                default_rule, tags[rule_table[default_rule].lhs]);

     }
 }
 
 
 void
     }
 }
 
 
 void

-finalize_conflicts (void)
+free_conflicts (void)

 {
 {

-  FREE (conflicts);
-  FREE (shiftset);
-  FREE (lookaheadset);
+  XFREE (conflicts);
+  XFREE (shiftset);
+  XFREE (lookaheadset);

 }
 }