* src/state.h (state_t): `solved_conflicts' is a new member.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d9461cc4a4e552cd48f1e75a3c250dba8707e9b8..c0faa97ab4db2214bffb2b85175f8eaab4dac83d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
-  solve_conflicts ();
+  conflicts_solve ();
   conflicts_print ();
 
   /* Output file names. */
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
   output ();
 
   reduce_free ();
-  free_conflicts ();
+  conflicts_free ();
   free_nullable ();
   free_derives ();
   grammar_free ();