Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into...

[satune.git] / src / classlist.h

diff --git a/src/classlist.h b/src/classlist.h
index c02268df29bebbe49d56cfca2fb272b297bc7321..cef1e1fe6bcc8fd4f46b50f73c71a0a9f945754a 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -12,79 +12,62 @@
 
 #include "mymemory.h"
 #include <inttypes.h>
-#define bool int
-#define true 1
-#define false 0
 
-struct CSolver;
-typedef struct CSolver CSolver;
+class CSolver;
 struct SATEncoder;
 typedef struct SATEncoder SATEncoder;
 
+class Boolean;
+class BooleanOrder;
+class BooleanVar;
+class BooleanLogic;
+class BooleanPredicate;
+class ASTNode;
+class Set;
+class MutableSet;
 
-struct Constraint;
-typedef struct Constraint Constraint;
+class ElementFunction;
+class ElementSet;
+class ElementConst;
+class Element;
 
-typedef struct BooleanOrder BooleanOrder;
-typedef struct BooleanVar BooleanVar;
-typedef struct BooleanLogic BooleanLogic;
-typedef struct BooleanPredicate BooleanPredicate;
+class FunctionOperator;
+class FunctionTable;
+class Function;
 
-struct ASTNode;
-typedef struct ASTNode ASTNode;
+class Predicate;
+class PredicateTable;
+class PredicateOperator;
+class Table;
+class Order;
+class OrderPair;
 
-struct Boolean;
-typedef struct Boolean Boolean;
+class OrderElement;
 
-struct IncrementalSolver;
-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;
+class ElementEncoding;
+class FunctionEncoding;
+class OrderEncoding;
 
-struct PredicateTable;
-typedef struct PredicateTable PredicateTable;
+class OrderGraph;
+class OrderNode;
+class OrderEdge;
 
-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 IncrementalSolver;
+typedef struct IncrementalSolver IncrementalSolver;
 
-struct ElementEncoding;
-typedef struct ElementEncoding ElementEncoding;
+struct TableEntry;
+typedef struct TableEntry TableEntry;
 
-struct FunctionEncoding;
-typedef struct FunctionEncoding FunctionEncoding;
+struct OrderEncoder;
+typedef struct OrderEncoder OrderEncoder;
 
-struct OrderEncoding;
-typedef struct OrderEncoding OrderEncoding;
+class Tuner;
+class TunableDesc;
 
-struct TableEntry;
-typedef struct TableEntry TableEntry;
+typedef int TunableParam;
 
 typedef unsigned int uint;
+typedef long int int64;
 typedef uint64_t VarType;
 #endif