Fix push parsing memory leak reported by Brandon Lucia at

[bison.git] / src / conflicts.c

diff --git a/src/conflicts.c b/src/conflicts.c
index 7bb3e08ee585e74ec236ee381923372e1ea7f106..ade54bd7b76d8034d4f4f3d5b3804232743f9271 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -1,7 +1,7 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
 /* Find and resolve or report lookahead conflicts for bison,
 

-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.

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


@@ -138,7 +138,7 @@ log_resolution (rule *r, symbol_number token,
 /*------------------------------------------------------------------.
 | Turn off the shift recorded for the specified token in the        |
 | specified state.  Used when we resolve a shift-reduce conflict in |
 /*------------------------------------------------------------------.
 | Turn off the shift recorded for the specified token in the        |
 | specified state.  Used when we resolve a shift-reduce conflict in |

-| favor of the reduction.                                           |
+| favor of the reduction or as an error (%nonassoc).                |

 `------------------------------------------------------------------*/
 
 static void
 `------------------------------------------------------------------*/
 
 static void


@@ -156,9 +156,9 @@ flush_shift (state *s, int token)
 
 
 /*--------------------------------------------------------------------.
 
 
 /*--------------------------------------------------------------------.

-| Turn off the reduce recorded for the specified token for the        |
-| specified lookahead.  Used when we resolve a shift-reduce conflict  |
-| in favor of the shift.                                              |
+| Turn off the reduce recorded for the specified token in the         |
+| specified lookahead set.  Used when we resolve a shift-reduce       |
+| conflict in favor of the shift or as an error (%nonassoc).          |

 `--------------------------------------------------------------------*/
 
 static void
 `--------------------------------------------------------------------*/
 
 static void


@@ -176,11 +176,12 @@ flush_reduce (bitset lookahead_tokens, int token)
 |                                                                   |
 | RULENO is the number of the lookahead bitset to consider.         |
 |                                                                   |
 |                                                                   |
 | RULENO is the number of the lookahead bitset to consider.         |
 |                                                                   |

-| ERRORS can be used to store discovered explicit errors.           |
+| ERRORS and NERRS can be used to store discovered explicit         |
+| errors.                                                           |

 `------------------------------------------------------------------*/
 
 static void
 `------------------------------------------------------------------*/
 
 static void

-resolve_sr_conflict (state *s, int ruleno, symbol **errors)
+resolve_sr_conflict (state *s, int ruleno, symbol **errors, int *nerrs)

 {
   symbol_number i;
   reductions *reds = s->reductions;
 {
   symbol_number i;
   reductions *reds = s->reductions;


@@ -188,7 +189,6 @@ resolve_sr_conflict (state *s, int ruleno, symbol **errors)
   rule *redrule = reds->rules[ruleno];
   int redprec = redrule->prec->prec;
   bitset lookahead_tokens = reds->lookahead_tokens[ruleno];
   rule *redrule = reds->rules[ruleno];
   int redprec = redrule->prec->prec;
   bitset lookahead_tokens = reds->lookahead_tokens[ruleno];

-  int nerrs = 0;

 
   for (i = 0; i < ntokens; i++)
     if (bitset_test (lookahead_tokens, i)
 
   for (i = 0; i < ntokens; i++)
     if (bitset_test (lookahead_tokens, i)


@@ -234,23 +234,10 @@ resolve_sr_conflict (state *s, int ruleno, symbol **errors)
              flush_shift (s, i);
              flush_reduce (lookahead_tokens, i);
              /* Record an explicit error for this token.  */
              flush_shift (s, i);
              flush_reduce (lookahead_tokens, i);
              /* Record an explicit error for this token.  */

-             errors[nerrs++] = symbols[i];
+             errors[(*nerrs)++] = symbols[i];

              break;
            }
       }
              break;
            }
       }

-
-  if (nerrs)
-    {
-      /* Some tokens have been explicitly made errors.  Allocate a
-        permanent errs structure for this state, to record them.  */
-      state_errs_set (s, nerrs, errors);
-    }
-
-  if (obstack_object_size (&solved_conflicts_obstack))
-    {
-      obstack_1grow (&solved_conflicts_obstack, '\0');
-      s->solved_conflicts = obstack_finish (&solved_conflicts_obstack);
-    }

 }
 
 
 }
 
 


@@ -267,6 +254,7 @@ set_conflicts (state *s, symbol **errors)
   int i;
   transitions *trans = s->transitions;
   reductions *reds = s->reductions;
   int i;
   transitions *trans = s->transitions;
   reductions *reds = s->reductions;

+  int nerrs = 0;

 
   if (s->consistent)
     return;
 
   if (s->consistent)
     return;


@@ -282,7 +270,19 @@ set_conflicts (state *s, symbol **errors)
   for (i = 0; i < reds->num; ++i)
     if (reds->rules[i]->prec && reds->rules[i]->prec->prec
        && !bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
   for (i = 0; i < reds->num; ++i)
     if (reds->rules[i]->prec && reds->rules[i]->prec->prec
        && !bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))

-      resolve_sr_conflict (s, i, errors);
+      resolve_sr_conflict (s, i, errors, &nerrs);
+
+  if (nerrs)
+    {
+      /* Some tokens have been explicitly made errors.  Allocate a
+         permanent errs structure for this state, to record them.  */
+      state_errs_set (s, nerrs, errors);
+    }
+  if (obstack_object_size (&solved_conflicts_obstack))
+    {
+      obstack_1grow (&solved_conflicts_obstack, '\0');
+      s->solved_conflicts = obstack_finish (&solved_conflicts_obstack);
+    }

 
   /* 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.  */


@@ -290,7 +290,6 @@ set_conflicts (state *s, symbol **errors)
     {
       if (!bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
        conflicts[s->number] = 1;
     {
       if (!bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set))
        conflicts[s->number] = 1;

-

       bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]);
     }
 }
       bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]);
     }
 }


@@ -327,6 +326,17 @@ conflicts_solve (void)
 }
 
 
 }
 
 

+void
+conflicts_update_state_numbers (state_number old_to_new[],
+                                state_number nstates_old)
+{
+  state_number i;
+  for (i = 0; i < nstates_old; ++i)
+    if (old_to_new[i] != nstates_old)
+      conflicts[old_to_new[i]] = conflicts[i];
+}
+
+

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