Fixing more bugs

[satune.git] / src / AST / order.h

diff --git a/src/AST/order.h b/src/AST/order.h
index 67f0d9928b5406e0df0b2bbd0fcf21e4b169f3c1..cc8b45e4adc7774e6b3510ef66fa80309a82ebbd 100644 (file)
--- a/src/AST/order.h
+++ b/src/AST/order.h
@@ -6,18 +6,25 @@
 #include "ops.h"
 #include "orderencoding.h"
 #include "boolean.h"
+#include "orderpair.h"
 
-struct Order {
+class Order {
+public:
+       Order(OrderType type, Set *set);
+       ~Order();
        OrderType type;
-       Set * set;
-       HashTableBoolConst* boolsToConstraints;
-       VectorBoolean constraints;
-       OrderEncoding order;
+       Set *set;
+       HashtableOrderPair *orderPairTable;
+       OrderGraph *graph;
+       Order *clone(CSolver *solver, CloneMap *map);
+       Vector<BooleanOrder *> constraints;
+       OrderEncoding encoding;
+       void setOrderResolver(OrderResolver *_resolver) { ASSERT(encoding.resolver == NULL); encoding.resolver = _resolver;};
+       void initializeOrderHashtable();
+       void initializeOrderElementsHashtable();
+       void addOrderConstraint(BooleanOrder *constraint);
+       void setOrderEncodingType(OrderEncodingType type);
+       CMEMALLOC;
 };
 
-Order* allocOrder(OrderType type, Set * set);
-void initializeOrderHashTable(Order * order);
-void addOrderConstraint(Order* order, BooleanOrder* constraint);
-void setOrderEncodingType(Order* order, OrderEncodingType type);
-void deleteOrder(Order* order);
 #endif