Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/constraint_compiler into...

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

diff --git a/src/AST/element.h b/src/AST/element.h
index a230055fe70285712de99ec0212f869f0235d2ba..544725624c4d4ab3ef6426fd4cc8fba070a756d0 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -8,16 +8,16 @@
 #include "elementencoding.h"
 #include "boolean.h"
 
-#define GETELEMENTTYPE(o) (o->type)
-#define GETELEMENTPARENTS(o) (&((Element *)o)->parents)
 class Element : public ASTNode {
 public:
        Element(ASTNodeType type);
        virtual ~Element() {}
        Vector<ASTNode *> parents;
        ElementEncoding encoding;
-       virtual Element * clone(CSolver * solver, CloneMap * map);
-       MEMALLOC;
+       virtual Element *clone(CSolver *solver, CloneMap *map) {ASSERT(0); return NULL;};
+       virtual void updateParents() {}
+       
+       CMEMALLOC;
 };
 
 class ElementConst : public Element {
@@ -25,27 +25,28 @@ public:
        ElementConst(uint64_t value, VarType type, Set *_set);
        Set *set;
        uint64_t value;
-       Element * clone(CSolver * solver, CloneMap * map);
-       MEMALLOC;
+       Element *clone(CSolver *solver, CloneMap *map);
+       CMEMALLOC;
 };
 
 class ElementSet : public Element {
 public:
        ElementSet(Set *s);
        Set *set;
-       Element * clone(CSolver * solver, CloneMap * map);
-       MEMALLOC;
+       Element *clone(CSolver *solver, CloneMap *map);
+       CMEMALLOC;
 };
 
 class ElementFunction : public Element {
 public:
-       ElementFunction(Function *function, Element **array, uint numArrays, Boolean *overflowstatus);
+       ElementFunction(Function *function, Element **array, uint numArrays, BooleanEdge overflowstatus);
        Function *function;
        Array<Element *> inputs;
-       Boolean *overflowstatus;
+       BooleanEdge overflowstatus;
        FunctionEncoding functionencoding;
-       Element * clone(CSolver * solver, CloneMap * map);
-       MEMALLOC;
+       Element *clone(CSolver *solver, CloneMap *map);
+       void updateParents();
+       CMEMALLOC;
 };
 
 Set *getElementSet(Element *This);