After resolving conflicts

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

diff --git a/src/AST/element.h b/src/AST/element.h
index 19e35b68f5d07f6c50e78488481f6421032b147f..1e7b1f2899aaba7883573adab92c09b923ad5d79 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -14,22 +14,26 @@ public:
        virtual ~Element() {}
        Vector<ASTNode *> parents;
        ElementEncoding encoding;
+       inline ElementEncoding *getElementEncoding() { return &encoding; }
        virtual Element *clone(CSolver *solver, CloneMap *map) {ASSERT(0); return NULL;};
-       virtual void serialize(Serializer* serializer) =0;
+       virtual void serialize(Serializer *serializer) = 0;
+       virtual void print() = 0;
        virtual void updateParents() {}
-       virtual Set * getRange() = 0;
+       virtual Set *getRange() = 0;
        CMEMALLOC;
 };
 
 class ElementSet : public Element {
 public:
        ElementSet(ASTNodeType type, Set *s);
+        virtual ~ElementSet(){}
        ElementSet(Set *s);
        virtual Element *clone(CSolver *solver, CloneMap *map);
-       virtual void serialize(Serializer* serializer);
+       virtual void serialize(Serializer *serializer);
+       virtual void print();
        CMEMALLOC;
        Set *getRange() {return set;}
- protected:
+protected:
        Set *set;
 
 };
@@ -37,31 +41,32 @@ public:
 class ElementConst : public ElementSet {
 public:
        ElementConst(uint64_t value, Set *_set);
+        virtual ~ElementConst(){}
        uint64_t value;
-       virtual void serialize(Serializer* serializer);
+       virtual void serialize(Serializer *serializer);
+       virtual void print();
        Element *clone(CSolver *solver, CloneMap *map);
        CMEMALLOC;
 };
 
 class ElementFunction : public Element {
 public:
+        virtual ~ElementFunction(){}
        ElementFunction(Function *function, Element **array, uint numArrays, BooleanEdge overflowstatus);
-       Function *function;
        Array<Element *> inputs;
        BooleanEdge overflowstatus;
        FunctionEncoding functionencoding;
        Element *clone(CSolver *solver, CloneMap *map);
-       virtual void serialize(Serializer* serializer);
-       Set * getRange();
+       virtual void serialize(Serializer *serializer);
+       virtual void print();
+       Set *getRange();
        void updateParents();
+       Function *getFunction() {return function;}
+       inline FunctionEncoding *getElementFunctionEncoding() {return &functionencoding;}
        CMEMALLOC;
+private:
+       Function *function;
 };
 
-static inline ElementEncoding *getElementEncoding(Element *e) {
-       return &e->encoding;
-}
 
-static inline FunctionEncoding *getElementFunctionEncoding(ElementFunction *func) {
-       return &func->functionencoding;
-}
 #endif