* src/lalr.h (reduction_table, shift_table): Removed arrays, which

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 626db9348306f187874ba1dd9d7614dbe0fff820..2f213850987ef20341f1b8db0464a7b6731a3c9c 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -19,6 +19,7 @@
    02111-1307, USA.  */
 
 #include "system.h"
    02111-1307, USA.  */
 
 #include "system.h"

+#include "complain.h"

 #include "getargs.h"
 #include "files.h"
 #include "gram.h"
 #include "getargs.h"
 #include "files.h"
 #include "gram.h"


@@ -28,17 +29,13 @@
 #include "reader.h"
 #include "LR0.h"
 
 #include "reader.h"
 #include "LR0.h"
 

-int any_conflicts = 0;

 errs **err_table = NULL;
 errs **err_table = NULL;

-int expected_conflicts;
+/* -1 stands for not specified. */
+int expected_conflicts = -1;

 static char *conflicts = NULL;
 
 static unsigned *shiftset = NULL;
 static unsigned *lookaheadset = NULL;
 static char *conflicts = NULL;
 
 static unsigned *shiftset = NULL;
 static unsigned *lookaheadset = NULL;

-static int src_total;
-static int rrc_total;
-static int src_count;
-static int rrc_count;

 \f
 
 static inline void
 \f
 
 static inline void


@@ -63,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)
     {


@@ -71,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;
        }
     }


@@ -200,13 +197,13 @@ set_conflicts (int state)
   for (i = 0; i < tokensetsize; i++)
     lookaheadset[i] = 0;
 
   for (i = 0; i < tokensetsize; i++)
     lookaheadset[i] = 0;
 

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

   if (shiftp)
     {
       k = shiftp->nshifts;
       for (i = 0; i < k; i++)
        {
   if (shiftp)
     {
       k = shiftp->nshifts;
       for (i = 0; i < k; i++)
        {

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

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


@@ -246,13 +243,8 @@ set_conflicts (int state)
       fp3 = lookaheadset;
 
       while (fp3 < fp4)
       fp3 = lookaheadset;
 
       while (fp3 < fp4)

-       {
-         if (*fp2++ & *fp3++)
-           {
-             conflicts[state] = 1;
-             any_conflicts = 1;
-           }
-       }
+       if (*fp2++ & *fp3++)
+         conflicts[state] = 1;

 
       fp2 = fp1;
       fp3 = lookaheadset;
 
       fp2 = fp1;
       fp3 = lookaheadset;


@@ -273,8 +265,6 @@ solve_conflicts (void)
 
   err_table = XCALLOC (errs *, nstates);
 
 
   err_table = XCALLOC (errs *, nstates);
 

-  any_conflicts = 0;
-

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


@@ -284,7 +274,7 @@ solve_conflicts (void)
 | 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;


@@ -296,11 +286,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++)
     {


@@ -313,7 +303,7 @@ 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);


@@ -351,6 +341,8 @@ count_sr_conflicts (int state)
          fp2++;
        }
     }
          fp2++;
        }
     }

+
+  return src_count;

 }
 
 
 }
 
 


@@ -358,33 +350,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 = lookaheads[state];
+  int n = lookaheads[state + 1];

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

-    return;
+    return 0;

 
   mask = 1;
   baseword = LA + m * tokensetsize;
   for (i = 0; i < ntokens; i++)
     {
 
   mask = 1;
   baseword = LA + m * tokensetsize;
   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)


@@ -403,6 +391,8 @@ count_rr_conflicts (int state)
          baseword++;
        }
     }
          baseword++;
        }
     }

+
+  return rrc_count;

 }
 
 /*--------------------------------------------------------------.
 }
 
 /*--------------------------------------------------------------.


@@ -416,31 +406,23 @@ conflict_report (int src_num, int rrc_num)
   static char res[4096];
   char *cp = res;
 
   static char res[4096];
   char *cp = res;
 

-  if (src_num == 1)
-    {
-      sprintf (cp, _(" 1 shift/reduce conflict"));
-      cp += strlen (cp);
-    }
-  else if (src_num > 1)
+  if (src_num >= 1)

     {
     {

-      sprintf (cp, _(" %d shift/reduce conflicts"), src_num);
+      sprintf (cp, ngettext ("%d shift/reduce conflict",
+                            "%d shift/reduce conflicts", src_num), src_num);

       cp += strlen (cp);
     }
 
   if (src_num > 0 && rrc_num > 0)
     {
       cp += strlen (cp);
     }
 
   if (src_num > 0 && rrc_num > 0)
     {

-      sprintf (cp, _(" and"));
+      sprintf (cp, " %s ", _("and"));

       cp += strlen (cp);
     }
 
       cp += strlen (cp);
     }
 

-  if (rrc_num == 1)
-    {
-      sprintf (cp, _(" 1 reduce/reduce conflict"));
-      cp += strlen (cp);
-    }
-  else if (rrc_num > 1)
+  if (rrc_num >= 1)

     {
     {

-      sprintf (cp, _(" %d reduce/reduce conflicts"), rrc_num);
+      sprintf (cp, ngettext ("%d reduce/reduce conflict",
+                            "%d reduce/reduce conflicts", rrc_num), rrc_num);

       cp += strlen (cp);
     }
 
       cp += strlen (cp);
     }
 


@@ -452,61 +434,81 @@ conflict_report (int src_num, int rrc_num)
 }
 
 
 }
 
 

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

 
 void
 
 void

-print_conflicts (FILE *out)
+conflicts_output (FILE *out)

 {
   int i;
 {
   int i;

+  for (i = 0; i < nstates; i++)
+    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.  |
+`------------------------------------------*/

 
 

-  src_total = 0;
-  rrc_total = 0;
+void
+conflicts_print (void)
+{
+  int i;

 
 

-  /* Count the total number of conflicts, and if wanted, give a
-     detailed report in FOUTPUT.  */
+  int src_total = 0;
+  int rrc_total = 0;
+
+  /* Conflicts by state.  */

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

+    if (conflicts[i])
+      {
+       src_total += count_sr_conflicts (i);
+       rrc_total += count_rr_conflicts (i);
+      }
+
+  /* Report the total number of conflicts on STDERR.  */
+  if (src_total || rrc_total)

     {
     {

-      if (conflicts[i])
+      if (yacc_flag)

        {
        {

-         count_sr_conflicts (i);
-         count_rr_conflicts (i);
-         src_total += src_count;
-         rrc_total += rrc_count;
-
-         if (verbose_flag)
-           {
-             fprintf (out, _("State %d contains"), i);
-             fputs (conflict_report (src_count, rrc_count), out);
-           }
+         /* 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);

        }
     }
 
        }
     }
 

-  /* 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
+  if (expected_conflicts != -1
+      && src_total != expected_conflicts)

     {
     {

-      fprintf (stderr, _("%s contains"), infile);
-      fputs (conflict_report (src_total, rrc_total), stderr);
+      complain_message_count++;
+      fprintf (stderr, ngettext ("expected %d shift/reduce conflict",
+                                "expected %d shift/reduce conflicts",
+                                expected_conflicts),
+              expected_conflicts);

     }
 }
 
 
 void
     }
 }
 
 
 void

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

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


@@ -531,7 +533,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;


@@ -539,7 +541,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,


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

-           obstack_fgrow3 (&output_obstack,
-                           _("    %-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[rlhs[default_rule]]);

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


@@ -596,9 +597,8 @@ print_reductions (int state)
            }
        }
 
            }
        }
 

-      obstack_fgrow2 (&output_obstack,
-                     _("    $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[rlhs[default_rule]]);

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


@@ -656,7 +656,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);


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

-                         obstack_fgrow3 (&output_obstack,
+                         fprintf (out,

                                   _("    %-4s\treduce using rule %d (%s)\n"),
                                   tags[i], rule, tags[rlhs[rule]]);
                        }
                                   _("    %-4s\treduce using rule %d (%s)\n"),
                                   tags[i], rule, tags[rlhs[rule]]);
                        }


@@ -699,13 +699,13 @@ print_reductions (int state)
                      if (defaulted)
                        {
                          rule = LAruleno[default_LA];
                      if (defaulted)
                        {
                          rule = LAruleno[default_LA];

-                         obstack_fgrow3 (&output_obstack,
+                         fprintf (out,

                                   _("    %-4s\treduce using rule %d (%s)\n"),
                                   tags[i], rule, tags[rlhs[rule]]);
                          defaulted = 0;
                        }
                      rule = LAruleno[j];
                                   _("    %-4s\treduce using rule %d (%s)\n"),
                                   tags[i], rule, tags[rlhs[rule]]);
                          defaulted = 0;
                        }
                      rule = LAruleno[j];

-                     obstack_fgrow3 (&output_obstack,
+                     fprintf (out,

                               _("    %-4s\t[reduce using rule %d (%s)]\n"),
                               tags[i], rule, tags[rlhs[rule]]);
                    }
                               _("    %-4s\t[reduce using rule %d (%s)]\n"),
                               tags[i], rule, tags[rlhs[rule]]);
                    }


@@ -726,11 +726,8 @@ print_reductions (int state)
        }
 
       if (default_LA >= 0)
        }
 
       if (default_LA >= 0)

-       obstack_fgrow2 (&output_obstack,
-                       _("    $default\treduce using rule %d (%s)\n"),
-                       default_rule, tags[rlhs[default_rule]]);
-
-      obstack_1grow (&output_obstack, '\n');
+       fprintf (out, _("    $default\treduce using rule %d (%s)\n"),
+                default_rule, tags[rlhs[default_rule]]);

     }
 }
 
     }
 }