Fixing more bugs

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

diff --git a/src/AST/order.h b/src/AST/order.h
index a4a7621d96bb794a6e5a90f035ce2b674fe0a6d5..cc8b45e4adc7774e6b3510ef66fa80309a82ebbd 100644 (file)
--- a/src/AST/order.h
+++ b/src/AST/order.h
@@ -6,21 +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;
-       HashTableOrderPair *orderPairTable;
-       HashSetOrderElement* elementTable;
+       HashtableOrderPair *orderPairTable;
        OrderGraph *graph;
-       VectorBooleanOrder constraints;
-       OrderEncoding order;
+       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 *This);
-void initializeOrderElementsHashTable(Order *This);
-void addOrderConstraint(Order *This, BooleanOrder *constraint);
-void setOrderEncodingType(Order *This, OrderEncodingType type);
-void deleteOrder(Order *This);
 #endif