Merge branch 'master' into brian

[satune.git] / src / classlist.h

diff --git a/src/classlist.h b/src/classlist.h
index f722a6e2331218e81535f978bd61a5eacdbddac9..4f44aff688db2bfe1578482b5f327dd647837721 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -18,14 +18,16 @@
 
 struct CSolver;
 typedef struct CSolver CSolver;
-
-struct Constraint;
-typedef struct Constraint Constraint;
+struct SATEncoder;
+typedef struct SATEncoder SATEncoder;
 
 typedef struct BooleanOrder BooleanOrder;
 typedef struct BooleanVar BooleanVar;
 typedef struct BooleanLogic BooleanLogic;
-typedef struct BooleanComp BooleanComp;
+typedef struct BooleanPredicate BooleanPredicate;
+
+struct ASTNode;
+typedef struct ASTNode ASTNode;
 
 struct Boolean;
 typedef struct Boolean Boolean;
@@ -35,41 +37,50 @@ typedef struct IncrementalSolver IncrementalSolver;
 
 struct Set;
 typedef struct Set Set;
-
 typedef struct Set MutableSet;
 
+typedef struct ElementFunction ElementFunction;
+typedef struct ElementSet ElementSet;
+
 struct Element;
 typedef struct Element Element;
 
+typedef struct FunctionOperator FunctionOperator;
+typedef struct FunctionTable FunctionTable;
+
 struct Function;
 typedef struct Function Function;
 
 struct Predicate;
 typedef struct Predicate Predicate;
 
+struct PredicateTable;
+typedef struct PredicateTable PredicateTable;
+
+struct PredicateOperator;
+typedef struct PredicateOperator PredicateOperator;
+
 struct Table;
 typedef struct Table Table;
 
 struct Order;
 typedef struct Order Order;
 
+struct OrderPair;
+typedef struct OrderPair OrderPair;
+
 struct ElementEncoding;
 typedef struct ElementEncoding ElementEncoding;
 
 struct FunctionEncoding;
 typedef struct FunctionEncoding FunctionEncoding;
 
+struct OrderEncoding;
+typedef struct OrderEncoding OrderEncoding;
+
 struct TableEntry;
 typedef struct TableEntry TableEntry;
 
-
-typedef enum ArithOp ArithOp;
-typedef enum LogicOp LogicOp;
-typedef enum CompOp CompOp;
-typedef enum OrderType OrderType;
-typedef enum BooleanType BooleanType;
-typedef enum OverFlowBehavior OverFlowBehavior;
-
 typedef unsigned int uint;
 typedef uint64_t VarType;
 #endif