Restructure transforms a little and run make tabbing

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

diff --git a/src/AST/boolean.h b/src/AST/boolean.h
index 4ade14a0eed9707a68e10a6aef5e6bf6ee959b79..5a4b5af48fd0568fb43c4c5c769bf484ff0a46fb 100644 (file)
--- a/src/AST/boolean.h
+++ b/src/AST/boolean.h
@@ -3,52 +3,77 @@
 #include "classlist.h"
 #include "mymemory.h"
 #include "ops.h"
+#include "astops.h"
 #include "structs.h"
 #include "astnode.h"
+#include "functionencoding.h"
+#include "constraint.h"
 
-/**
-    This is a little sketchy, but apparently legit.
-    https://www.python.org/dev/peps/pep-3123/ */
+class Boolean : public ASTNode {
+public:
+       Boolean(ASTNodeType _type);
+       virtual ~Boolean() {}
+       virtual Boolean *clone(CSolver *solver, CloneMap *map) = 0;
+       virtual bool isTrue() {return false;}
+       virtual bool isFalse() {return false;}
+       Polarity polarity;
+       BooleanValue boolVal;
+       Vector<Boolean *> parents;
 
-#define GETBOOLEANTYPE(o) GETASTNODETYPE(o)
-#define GETBOOLEANPARENTS(o) (&((Boolean *)(o))->parents)
-
-struct Boolean {
-       ASTNode base;
-       VectorBoolean parents;
+       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;}
+       bool istrue;
+       CMEMALLOC;
 };
 
-struct BooleanVar {
-       Boolean base;
+class BooleanVar : public Boolean {
+public:
+       BooleanVar(VarType t);
+       Boolean *clone(CSolver *solver, CloneMap *map);
+
        VarType vtype;
-       Constraint * var;
+       Edge var;
+       CMEMALLOC;
 };
 
-struct BooleanLogic {
-       Boolean base;
-       LogicOp op;
-       Boolean ** array;
-       uint numArray;
+class BooleanOrder : public Boolean {
+public:
+       BooleanOrder(Order *_order, uint64_t _first, uint64_t _second);
+       Boolean *clone(CSolver *solver, CloneMap *map);
+
+       Order *order;
+       uint64_t first;
+       uint64_t second;
+       CMEMALLOC;
 };
 
-struct BooleanPredicate {
-       Boolean base;
-       Predicate * predicate;
-       Element** inputs;
-       int numInputs;
+class BooleanPredicate : public Boolean {
+public:
+       BooleanPredicate(Predicate *_predicate, Element **_inputs, uint _numInputs, Boolean *_undefinedStatus);
+       Boolean *clone(CSolver *solver, CloneMap *map);
+
+       Predicate *predicate;
+       FunctionEncoding encoding;
+       Array<Element *> inputs;
+       Boolean *undefStatus;
+       FunctionEncoding *getFunctionEncoding() {return &encoding;}
+       CMEMALLOC;
 };
 
-Boolean * allocBoolean(VarType t);
-Boolean * allocBooleanOrder(Order * order, uint64_t first, uint64_t second);
-Boolean * allocBooleanPredicate(Predicate * predicate, Element ** inputs, uint numInputs);
-Boolean * allocBooleanLogicArray(CSolver *solver, LogicOp op, Boolean ** array, uint asize);
-void deleteBoolean(Boolean * This);
+class BooleanLogic : public Boolean {
+public:
+       BooleanLogic(CSolver *solver, LogicOp _op, Boolean **array, uint asize);
+       Boolean *clone(CSolver *solver, CloneMap *map);
 
+       LogicOp op;
+       Array<Boolean *> inputs;
+       CMEMALLOC;
+};
 #endif