Fix push parsing memory leak reported by Brandon Lucia at

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index bd21253ecf182bedb020b3188e4df9039738f60f..95c5d69b7c547b11c7a511e63be5540cc3c90c55 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,5 @@
-/* Find and resolve or report look-ahead conflicts for bison,
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Find and resolve or report lookahead conflicts for bison,
+   Copyright (C) 2000, 2001, 2002, 2004, 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.
 


@@ -15,18 +15,33 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to the Free
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to the Free

-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 #ifndef CONFLICTS_H_
 # define CONFLICTS_H_
 # include "state.h"
 
 
 #ifndef CONFLICTS_H_
 # define CONFLICTS_H_
 # include "state.h"
 

-void conflicts_solve PARAMS ((void));
-void conflicts_print PARAMS ((void));
-void conflicts_output PARAMS ((FILE *out));
-void conflicts_free PARAMS ((void));
+void conflicts_solve (void);
+
+/**
+ * Update state numbers recorded in internal arrays such that:
+ *   - \c nstates_old is the old number of states.
+ *   - Where \c i is the old state number, <tt>old_to_new[i]</tt> is either:
+ *     - \c nstates_old if state \c i is removed because it is unreachable.
+ *     - The new state number.
+ *   - The highest new state number is the number of remaining states - 1.
+ *   - The numerical order of the remaining states has not changed.
+ */
+void conflicts_update_state_numbers (state_number old_to_new[],
+                                     state_number nstates_old);
+
+void conflicts_print (void);
+int conflicts_total_count (void);
+void conflicts_output (FILE *out);
+void conflicts_free (void);

 
 /* Were there conflicts? */
 
 /* Were there conflicts? */

-extern int expected_conflicts;
+extern int expected_sr_conflicts;
+extern int expected_rr_conflicts;

 #endif /* !CONFLICTS_H_ */
 #endif /* !CONFLICTS_H_ */