* doc/bison.texinfo (Stack Overflow): xref to Recursion.

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index cbf385ac3049d18786c377baded8a93aa5fff83b..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,
+resolve_sr_conflict (state_t *state, int ruleno,

                     symbol_t **errs)
 {
   symbol_number_t i;
                     symbol_t **errs)
 {
   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++)


@@ -259,6 +260,7 @@ 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;
 
   if (state->consistent)
     return;


@@ -271,10 +273,9 @@ set_conflicts (state_t *state, symbol_t **errs)
   /* 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;


@@ -282,12 +283,12 @@ set_conflicts (state_t *state, symbol_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]);

     }
 }
 
     }
 }
 


@@ -333,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;


@@ -343,8 +345,8 @@ count_sr_conflicts (state_t *state)
   FOR_EACH_SHIFT (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);
 


@@ -365,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)


@@ -451,14 +451,10 @@ void
 conflicts_output (FILE *out)
 {
   bool printed_sth = FALSE;
 conflicts_output (FILE *out)
 {
   bool printed_sth = FALSE;

-  bool *used_rules = XCALLOC (bool, nrules);

   state_number_t i;
   for (i = 0; i < nstates; i++)
     {
       state_t *s = states[i];
   state_number_t i;
   for (i = 0; i < nstates; i++)
     {
       state_t *s = states[i];

-      int j;
-      for (j = 0; j < s->reductions->num; ++j)
-       used_rules[s->reductions->rules[j]->number] = TRUE;

       if (conflicts[i])
        {
          fprintf (out, _("State %d contains "), i);
       if (conflicts[i])
        {
          fprintf (out, _("State %d contains "), i);


@@ -470,23 +466,6 @@ conflicts_output (FILE *out)
     }
   if (printed_sth)
     fputs ("\n\n", out);
     }
   if (printed_sth)
     fputs ("\n\n", out);

-
-  for (i = 0; i < nstates; i++)
-    {
-      state_t *s = states[i];
-      reductions_t *r = s->reductions;
-      int j;
-      for (j = 0; j < r->num; ++j)
-       if (!used_rules[r->rules[j]->number])
-         {
-           LOCATION_PRINT (stderr, r->rules[j]->location);
-           fprintf (stderr, ": %s: %s: ",
-                    _("warning"),
-                    _("rule never reduced because of conflicts"));
-           rule_print (r->rules[j], stderr);
-         }
-    }
-  free (used_rules);

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