* src/gram.h (rule_t): `guard' and `guard_line' are new members.

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 88c78aa2e959df461297544f8c9a9e8943aedda1..cf04c0e99713d8f81b70fb1a0e4320c9bd62e04b 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 Free Software Foundation, Inc.
+   Copyright 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -22,13 +22,12 @@
 # define CONFLICTS_H_
 # include "state.h"
 
-void initialize_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((void));
-void print_reductions PARAMS ((int));
-void finalize_conflicts PARAMS ((void));
+void solve_conflicts PARAMS ((void));
+void conflicts_print PARAMS ((void));
+void conflicts_output PARAMS ((FILE *out));
+void print_reductions PARAMS ((FILE*out, state_t *state));
+void free_conflicts PARAMS ((void));
 
 /* Were there conflicts? */
-extern int any_conflicts;
-extern errs **err_table;
 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */