* po/sv.po: New.

[bison.git] / src / conflicts.h

diff --git a/src/conflicts.h b/src/conflicts.h
index 43c8a2c6c02416336d3ae11ba8f8a4613de6839a..b74cb22c3f3f1477eb12bb29b711ba109625196d 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -1,5 +1,5 @@
 /* Find and resolve or report look-ahead conflicts for bison,
 /* Find and resolve or report look-ahead conflicts for bison,

-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright 2000 Free Software Foundation, Inc.

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


@@ -20,14 +20,15 @@
 
 #ifndef CONFLICTS_H_
 # define CONFLICTS_H_
 
 #ifndef CONFLICTS_H_
 # 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, int state));
+void free_conflicts PARAMS ((void));

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

-extern int any_conflicts;

 extern errs **err_table;
 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */
 extern errs **err_table;
 extern int expected_conflicts;
 #endif /* !CONFLICTS_H_ */