Merging with branch master and fixing bugs

[satune.git] / src / classlist.h

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