Merge branch 'master' into brian

[satune.git] / src / classlist.h

diff --git a/src/classlist.h b/src/classlist.h
index 6335297f5088143c38dbbfd1ea5bb5add7318683..4f44aff688db2bfe1578482b5f327dd647837721 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -21,14 +21,13 @@ 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;
+typedef struct BooleanPredicate BooleanPredicate;
+
+struct ASTNode;
+typedef struct ASTNode ASTNode;
 
 struct Boolean;
 typedef struct Boolean Boolean;
@@ -40,21 +39,36 @@ 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;