X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=src%2FAST%2Fboolean.h;h=1c45f04b0cdfeb4c73733f67050084249c4c7f52;hb=abe0dee853780f8254436b0de7c8330d326d4017;hp=3d3a90639b8b7596c2849fdc749e233ae6ebecb8;hpb=51284423bbf2892559139c683c7df54d4fdf5e29;p=satune.git

diff --git a/src/AST/boolean.h b/src/AST/boolean.h
index 3d3a906..1c45f04 100644
--- a/src/AST/boolean.h
+++ b/src/AST/boolean.h
@@ -3,58 +3,95 @@
 #include "classlist.h"
 #include "mymemory.h"
 #include "ops.h"
+#include "astops.h"
 #include "structs.h"
 #include "astnode.h"
 #include "functionencoding.h"
 #include "constraint.h"
+#include "serializable.h"
+#include "serializer.h"
 
-/**
-    This is a little sketchy, but apparently legit.
-    https://www.python.org/dev/peps/pep-3123/ */
-
-#define GETBOOLEANTYPE(o) GETASTNODETYPE(o)
-#define GETBOOLEANPARENTS(o) (&((Boolean *)(o))->parents)
-
-struct Boolean {
-	ASTNode base;
-	VectorBoolean parents;
+class Boolean : public ASTNode, public Serializable {
+public:
+	Boolean(ASTNodeType _type);
+	virtual ~Boolean() {}
+	virtual Boolean *clone(CSolver *solver, CloneMap *map) = 0;
+	virtual void serialize(Serializer* ) = 0;
+	virtual bool isTrue() {return boolVal == BV_MUSTBETRUE;}
+	virtual bool isFalse() {return boolVal == BV_MUSTBEFALSE;}
+	Polarity polarity;
+	BooleanValue boolVal;
+	Vector<Boolean *> parents;
+	virtual void updateParents() {}
+	
+	CMEMALLOC;
 };
 
-struct BooleanOrder {
-	Boolean base;
-	Order* order;
-	uint64_t first;
-	uint64_t second;
+class BooleanConst : public Boolean {
+public:
+	BooleanConst(bool isTrue);
+	Boolean *clone(CSolver *solver, CloneMap *map);
+	bool isTrue() {return istrue;}
+	bool isFalse() {return !istrue;}
+	void serialize(Serializer *serializer ){};
+	
+	bool istrue;
+	CMEMALLOC;
 };
 
-struct BooleanVar {
-	Boolean base;
+class BooleanVar : public Boolean {
+public:
+	BooleanVar(VarType t);
+	Boolean *clone(CSolver *solver, CloneMap *map);
+	void serialize(Serializer *serializer );
+	
 	VarType vtype;
 	Edge var;
+	CMEMALLOC;
 };
 
-struct BooleanLogic {
-	Boolean base;
-	LogicOp op;
-	ArrayBoolean inputs;
+class BooleanOrder : public Boolean {
+public:
+	BooleanOrder(Order *_order, uint64_t _first, uint64_t _second);
+	Boolean *clone(CSolver *solver, CloneMap *map);
+	void serialize(Serializer *serializer );
+	
+	Order *order;
+	uint64_t first;
+	uint64_t second;
+	CMEMALLOC;
 };
 
-struct BooleanPredicate {
-	Boolean base;
-	Predicate * predicate;
+class BooleanPredicate : public Boolean {
+public:
+	BooleanPredicate(Predicate *_predicate, Element **_inputs, uint _numInputs, BooleanEdge _undefinedStatus);
+	Boolean *clone(CSolver *solver, CloneMap *map);
+	void serialize(Serializer *serializer );
+
+	Predicate *predicate;
 	FunctionEncoding encoding;
-	ArrayElement inputs;
-	Boolean* undefStatus;
+	Array<Element *> inputs;
+	BooleanEdge undefStatus;
+	FunctionEncoding *getFunctionEncoding() {return &encoding;}
+	void updateParents();
+
+	CMEMALLOC;
 };
 
-Boolean * allocBooleanVar(VarType t);
-Boolean * allocBooleanOrder(Order * order, uint64_t first, uint64_t second);
-Boolean * allocBooleanPredicate(Predicate * predicate, Element ** inputs, uint numInputs, Boolean* undefinedStatus);
-Boolean * allocBooleanLogicArray(CSolver *solver, LogicOp op, Boolean ** array, uint asize);
-void deleteBoolean(Boolean * This);
+class BooleanLogic : public Boolean {
+public:
+	BooleanLogic(CSolver *solver, LogicOp _op, BooleanEdge *array, uint asize);
+	Boolean *clone(CSolver *solver, CloneMap *map);
+	void serialize(Serializer *serializer );
+	
+	LogicOp op;
+	bool replaced;
+	Array<BooleanEdge> inputs;
+	void updateParents();
+	
+	CMEMALLOC;
+};
+BooleanEdge cloneEdge(CSolver *solver, CloneMap *map, BooleanEdge e);
 
-static inline FunctionEncoding* getPredicateFunctionEncoding(BooleanPredicate* func){
-	return &func->encoding;
-}
 
 #endif