Fix warnings, merge, and check my code in

[satune.git] / src / classlist.h

diff --git a/src/classlist.h b/src/classlist.h
index b53e0312cf7ee93e3aff5c86984eabda5abbef70..237d529be962f45906e0fc00918247152f05e74b 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -18,10 +18,18 @@
 
 struct CSolver;
 typedef struct CSolver CSolver;
+struct SATEncoder;
+typedef struct SATEncoder SATEncoder;
+
 
 struct Constraint;
 typedef struct Constraint Constraint;
 
+typedef struct BooleanOrder BooleanOrder;
+typedef struct BooleanVar BooleanVar;
+typedef struct BooleanLogic BooleanLogic;
+typedef struct BooleanComp BooleanComp;
+
 struct Boolean;
 typedef struct Boolean Boolean;
 
@@ -30,12 +38,14 @@ typedef struct IncrementalSolver IncrementalSolver;
 
 struct Set;
 typedef struct Set Set;
-
 typedef struct Set MutableSet;
 
 struct Element;
 typedef struct Element Element;
 
+typedef struct FunctionOperator FunctionOperator;
+typedef struct FunctionTable FunctionTable;
+
 struct Function;
 typedef struct Function Function;
 
@@ -54,11 +64,11 @@ typedef struct ElementEncoding ElementEncoding;
 struct FunctionEncoding;
 typedef struct FunctionEncoding FunctionEncoding;
 
-typedef enum ArithOp ArithOp;
-typedef enum LogicOp LogicOp;
-typedef enum CompOp CompOp;
-typedef enum OrderType OrderType;
-typedef enum OverFlowBehavior OverFlowBehavior;
+struct OrderEncoding;
+typedef struct OrderEncoding OrderEncoding;
+
+struct TableEntry;
+typedef struct TableEntry TableEntry;
 
 typedef unsigned int uint;
 typedef uint64_t VarType;