tests: minor refactoring

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 43c8a2c6c02416336d3ae11ba8f8a4613de6839a..5df578716281ff0bf768a4de6a00c3deb9447a86 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,33 +1,47 @@
-/* Find and resolve or report look-ahead conflicts for bison,
-   Copyright (C) 2000 Free Software Foundation, Inc.
+/* Find and resolve or report lookahead conflicts for bison,
+
+   Copyright (C) 2000-2002, 2004, 2007, 2009-2013 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   Bison is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef CONFLICTS_H_
 # define CONFLICTS_H_
+# include "state.h"
+
+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 initialize_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((void));
-void print_reductions PARAMS ((int));
-void finalize_conflicts PARAMS ((void));
+void conflicts_print (void);
+int conflicts_total_count (void);
+void conflicts_output (FILE *out);
+void conflicts_free (void);
 
 /* Were there conflicts? */
-extern int any_conflicts;
-extern errs **err_table;
-extern int expected_conflicts;
+extern int expected_sr_conflicts;
+extern int expected_rr_conflicts;
 #endif /* !CONFLICTS_H_ */