Merge branch 'master' into brian

[satune.git] / src / classlist.h

diff --git a/src/classlist.h b/src/classlist.h
index c6a7cb7f434902896e69c9f0cf20a4bf3687458e..4f44aff688db2bfe1578482b5f327dd647837721 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -9,7 +9,7 @@
 
 #ifndef CLASSLIST_H
 #define CLASSLIST_H
-//#include "hashset.h"
+
 #include "mymemory.h"
 #include <inttypes.h>
 #define bool int
@@ -18,9 +18,16 @@
 
 struct CSolver;
 typedef struct CSolver CSolver;
+struct SATEncoder;
+typedef struct SATEncoder SATEncoder;
+
+typedef struct BooleanOrder BooleanOrder;
+typedef struct BooleanVar BooleanVar;
+typedef struct BooleanLogic BooleanLogic;
+typedef struct BooleanPredicate BooleanPredicate;
 
-struct Constraint;
-typedef struct Constraint Constraint;
+struct ASTNode;
+typedef struct ASTNode ASTNode;
 
 struct Boolean;
 typedef struct Boolean Boolean;
@@ -30,24 +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 unsigned int uint;
 typedef uint64_t VarType;
 #endif