* configure.ac (AC_GNU_SOURCE): Use it instead of hand written code.

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 55468fd2b8efb56da25f4835222f95e03d75ea8a..24f27cc8a37df8aad94bd6d20e83852be013e0b4 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -175,14 +175,15 @@ flush_reduce (bitset lookaheads, int token)
 `------------------------------------------------------------------*/
 
 static void
 `------------------------------------------------------------------*/
 
 static void

-resolve_sr_conflict (state_t *state, int lookahead,
-                    symbol_number_t *errs)
+resolve_sr_conflict (state_t *state, int ruleno,
+                    symbol_t **errs)

 {
   symbol_number_t i;
 {
   symbol_number_t i;

+  reductions_t *reds = state->reductions;

   /* Find the rule to reduce by to get precedence of reduction.  */
   /* Find the rule to reduce by to get precedence of reduction.  */

-  rule_t *redrule = state->lookaheads_rule[lookahead];
+  rule_t *redrule = reds->rules[ruleno];

   int redprec = redrule->prec->prec;
   int redprec = redrule->prec->prec;

-  bitset lookaheads = state->lookaheads[lookahead];
+  bitset lookaheads = reds->lookaheads[ruleno];

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


@@ -226,7 +227,7 @@ resolve_sr_conflict (state_t *state, int lookahead,
              flush_shift (state, i);
              flush_reduce (lookaheads, i);
              /* Record an explicit error for this token.  */
              flush_shift (state, i);
              flush_reduce (lookaheads, i);
              /* Record an explicit error for this token.  */

-             errs[nerrs++] = i;
+             errs[nerrs++] = symbols[i];

              break;
 
            case undef_assoc:
              break;
 
            case undef_assoc:


@@ -255,27 +256,26 @@ resolve_sr_conflict (state_t *state, int lookahead,
 `-------------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------------*/
 
 static void

-set_conflicts (state_t *state, symbol_number_t *errs)
+set_conflicts (state_t *state, symbol_t **errs)

 {
   int i;
   transitions_t *transitions = state->transitions;
 {
   int i;
   transitions_t *transitions = state->transitions;

+  reductions_t *reds = state->reductions;

 
   if (state->consistent)
     return;
 
   bitset_zero (lookaheadset);
 
 
   if (state->consistent)
     return;
 
   bitset_zero (lookaheadset);
 

-  for (i = 0; i < transitions->num && TRANSITION_IS_SHIFT (transitions, i); i++)
-    if (!TRANSITION_IS_DISABLED (transitions, i))
-      bitset_set (lookaheadset, TRANSITION_SYMBOL (transitions, i));
+  FOR_EACH_SHIFT (transitions, i)
+    bitset_set (lookaheadset, TRANSITION_SYMBOL (transitions, i));

 
   /* 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 = 0; i < state->nlookaheads; ++i)
-    if (state->lookaheads_rule[i]->prec
-       && state->lookaheads_rule[i]->prec->prec
-       && !bitset_disjoint_p (state->lookaheads[i], lookaheadset))
+  for (i = 0; i < reds->num; ++i)
+    if (reds->rules[i]->prec && reds->rules[i]->prec->prec
+       && !bitset_disjoint_p (reds->lookaheads[i], lookaheadset))

       {
        resolve_sr_conflict (state, i, errs);
        break;
       {
        resolve_sr_conflict (state, i, errs);
        break;


@@ -283,12 +283,12 @@ set_conflicts (state_t *state, symbol_number_t *errs)
 
   /* 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 = 0; i < state->nlookaheads; ++i)
+  for (i = 0; i < reds->num; ++i)

     {
     {

-      if (!bitset_disjoint_p (state->lookaheads[i], lookaheadset))
+      if (!bitset_disjoint_p (reds->lookaheads[i], lookaheadset))

        conflicts[state->number] = 1;
 
        conflicts[state->number] = 1;
 

-      bitset_or (lookaheadset, lookaheadset, state->lookaheads[i]);
+      bitset_or (lookaheadset, lookaheadset, reds->lookaheads[i]);

     }
 }
 
     }
 }
 


@@ -303,7 +303,7 @@ conflicts_solve (void)
 {
   state_number_t i;
   /* List of lookaheads on which we explicitly raise a parse error.  */
 {
   state_number_t i;
   /* List of lookaheads on which we explicitly raise a parse error.  */

-  symbol_number_t *errs = XMALLOC (symbol_number_t, ntokens + 1);
+  symbol_t **errs = XMALLOC (symbol_t *, ntokens + 1);

 
   conflicts = XCALLOC (char, nstates);
   shiftset = bitset_create (ntokens, BITSET_FIXED);
 
   conflicts = XCALLOC (char, nstates);
   shiftset = bitset_create (ntokens, BITSET_FIXED);


@@ -334,6 +334,7 @@ count_sr_conflicts (state_t *state)
   int i;
   int src_count = 0;
   transitions_t *transitions = state->transitions;
   int i;
   int src_count = 0;
   transitions_t *transitions = state->transitions;

+  reductions_t *reds = state->reductions;

 
   if (!transitions)
     return 0;
 
   if (!transitions)
     return 0;


@@ -341,12 +342,11 @@ count_sr_conflicts (state_t *state)
   bitset_zero (lookaheadset);
   bitset_zero (shiftset);
 
   bitset_zero (lookaheadset);
   bitset_zero (shiftset);
 

-  for (i = 0; i < transitions->num && TRANSITION_IS_SHIFT (transitions, i); i++)
-    if (!TRANSITION_IS_DISABLED (transitions, i))
-      bitset_set (shiftset, TRANSITION_SYMBOL (transitions, i));
+  FOR_EACH_SHIFT (transitions, i)
+    bitset_set (shiftset, TRANSITION_SYMBOL (transitions, i));

 
 

-  for (i = 0; i < state->nlookaheads; ++i)
-    bitset_or (lookaheadset, lookaheadset, state->lookaheads[i]);
+  for (i = 0; i < reds->num; ++i)
+    bitset_or (lookaheadset, lookaheadset, reds->lookaheads[i]);

 
   bitset_and (lookaheadset, lookaheadset, shiftset);
 
 
   bitset_and (lookaheadset, lookaheadset, shiftset);
 


@@ -367,17 +367,15 @@ static int
 count_rr_conflicts (state_t *state, int one_per_token)
 {
   int i;
 count_rr_conflicts (state_t *state, int one_per_token)
 {
   int i;

+  reductions_t *reds = state->reductions;

   int rrc_count = 0;
 
   int rrc_count = 0;
 

-  if (state->nlookaheads < 2)
-    return 0;
-

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

-      for (j = 0; j < state->nlookaheads; ++j)
-       if (bitset_test (state->lookaheads[j], i))
+      for (j = 0; j < reds->num; ++j)
+       if (bitset_test (reds->lookaheads[j], i))

          count++;
 
       if (count >= 2)
          count++;
 
       if (count >= 2)


@@ -387,6 +385,7 @@ count_rr_conflicts (state_t *state, int one_per_token)
   return rrc_count;
 }
 
   return rrc_count;
 }
 

+

 /*--------------------------------------------------------------.
 | Return a human readable string which reports shift/reduce and |
 | reduce/reduce conflict numbers (SRC_NUM, RRC_NUM).            |
 /*--------------------------------------------------------------.
 | Return a human readable string which reports shift/reduce and |
 | reduce/reduce conflict numbers (SRC_NUM, RRC_NUM).            |


@@ -418,14 +417,32 @@ conflict_report (int src_num, int rrc_num)
       cp += strlen (cp);
     }
 
       cp += strlen (cp);
     }
 

-  *cp++ = '.';
-  *cp++ = '\n';

   *cp++ = '\0';
 
   return res;
 }
 
 
   *cp++ = '\0';
 
   return res;
 }
 
 

+/*----------------------------------------------------------------.
+| Same as above, but report the number of conflicts a` la POSIX.  |
+`----------------------------------------------------------------*/
+
+static void
+conflict_report_yacc (int src_num, int rrc_num)
+{
+  /* If invoked with `--yacc', use the output format specified by
+     POSIX.  */
+  fprintf (stderr, _("conflicts: "));
+  if (src_num > 0)
+    fprintf (stderr, _(" %d shift/reduce"), src_num);
+  if (src_num > 0 && rrc_num > 0)
+    fprintf (stderr, ",");
+  if (rrc_num > 0)
+    fprintf (stderr, _(" %d reduce/reduce"), rrc_num);
+  putc ('\n', stderr);
+}
+
+

 /*-----------------------------------------------------------.
 | Output the detailed description of states with conflicts.  |
 `-----------------------------------------------------------*/
 /*-----------------------------------------------------------.
 | Output the detailed description of states with conflicts.  |
 `-----------------------------------------------------------*/


@@ -436,13 +453,17 @@ conflicts_output (FILE *out)
   bool printed_sth = FALSE;
   state_number_t i;
   for (i = 0; i < nstates; i++)
   bool printed_sth = FALSE;
   state_number_t i;
   for (i = 0; i < nstates; i++)

-    if (conflicts[i])
-      {
-       fprintf (out, _("State %d contains "), i);
-       fputs (conflict_report (count_sr_conflicts (states[i]),
-                               count_rr_conflicts (states[i], TRUE)), out);
-       printed_sth = TRUE;
-      }
+    {
+      state_t *s = states[i];
+      if (conflicts[i])
+       {
+         fprintf (out, _("State %d contains "), i);
+         fprintf (out, "%s.\n",
+                  conflict_report (count_sr_conflicts (s),
+                                   count_rr_conflicts (s, TRUE)));
+         printed_sth = TRUE;
+       }
+    }

   if (printed_sth)
     fputs ("\n\n", out);
 }
   if (printed_sth)
     fputs ("\n\n", out);
 }


@@ -508,32 +529,15 @@ conflicts_print (void)
 
   /* Report the total number of conflicts on STDERR.  */
   if (yacc_flag)
 
   /* 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);
-    }
+    conflict_report_yacc (src_total, rrc_total);

   else
   else

-    {
-      fprintf (stderr, _("%s contains "), infile);
-      fputs (conflict_report (src_total, rrc_total), stderr);
-    }
+    warn ("%s", conflict_report (src_total, rrc_total));

 
   if (expected_conflicts != -1 && !src_ok)
 
   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);
-    }
+    complain (ngettext ("expected %d shift/reduce conflict",
+                       "expected %d shift/reduce conflicts",
+                       expected_conflicts),
+             expected_conflicts);

 }
 
 
 }