backout changes

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

diff --git a/src/AST/predicate.h b/src/AST/predicate.h
index 513e3869d5000681826a0e90e0d2fdef951e2d4f..beaebc9b09989122f45d64573a0e7868c499f0b2 100644 (file)
--- a/src/AST/predicate.h
+++ b/src/AST/predicate.h
@@ -3,14 +3,40 @@
 #include "classlist.h"
 #include "mymemory.h"
 #include "ops.h"
+#include "astops.h"
 #include "structs.h"
+#include "common.h"
 
-struct Predicate {
-       CompOp op;
-       VectorSet* domains;
+class Predicate {
+public:
+       Predicate(PredicateType _type) : type(_type) {}
+       virtual ~Predicate() {}
+       virtual Predicate *clone(CSolver *solver, CloneMap *map) {ASSERT(0); return NULL;}
+       virtual void serialize(Serializer* serializer) = 0;
+       PredicateType type;
+       CMEMALLOC;
 };
 
+class PredicateOperator : public Predicate {
+public:
+       PredicateOperator(CompOp op, Set **domain, uint numDomain);
+       bool evalPredicateOperator(uint64_t *inputs);
+       Predicate *clone(CSolver *solver, CloneMap *map);
+       virtual void serialize(Serializer* serializer);
+       Array<Set *> domains;
+       CompOp getOp() {return op;}
+       CMEMALLOC;
+ private:
+       CompOp op;
+};
 
-Predicate* allocPredicate(CompOp op, Set ** domain, uint numDomain);
-void deletePredicate(Predicate* predicate);
+class PredicateTable : public Predicate {
+public:
+       PredicateTable(Table *table, UndefinedBehavior undefBehavior);
+       Predicate *clone(CSolver *solver, CloneMap *map);
+       virtual void serialize(Serializer* serializer);
+       Table *table;
+       UndefinedBehavior undefinedbehavior;
+       CMEMALLOC;
+};
 #endif