Bug fix

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

diff --git a/src/AST/element.h b/src/AST/element.h
index c3a3ed9fe2bd764207756b8fdfbc755cd1dfd0cc..b74e582630d594d22708e1114442ed4cba3310ee 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -14,24 +14,35 @@ 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 print() = 0;
+       virtual void updateParents() {}
+       virtual Set *getRange() = 0;
        CMEMALLOC;
 };
 
-class ElementConst : public Element {
+class ElementSet : public Element {
 public:
-       ElementConst(uint64_t value, VarType type, Set *_set);
-       Set *set;
-       uint64_t value;
-       Element *clone(CSolver *solver, CloneMap *map);
+       ElementSet(ASTNodeType type, Set *s);
+       ElementSet(Set *s);
+       virtual Element *clone(CSolver *solver, CloneMap *map);
+       virtual void serialize(Serializer *serializer);
+       virtual void print();
        CMEMALLOC;
+       Set *getRange() {return set;}
+protected:
+       Set *set;
+
 };
 
-class ElementSet : public Element {
+class ElementConst : public ElementSet {
 public:
-       ElementSet(Set *s);
-       Set *set;
+       ElementConst(uint64_t value, Set *_set);
+       uint64_t value;
+       virtual void serialize(Serializer *serializer);
+       virtual void print();
        Element *clone(CSolver *solver, CloneMap *map);
        CMEMALLOC;
 };
@@ -39,21 +50,20 @@ public:
 class ElementFunction : public Element {
 public:
        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);
+       virtual void print();
+       Set *getRange();
+       void updateParents();
+       Function *getFunction() {return function;}
+       inline FunctionEncoding *getElementFunctionEncoding() {return &functionencoding;}
        CMEMALLOC;
+private:
+       Function *function;
 };
 
-Set *getElementSet(Element *This);
-
-static inline ElementEncoding *getElementEncoding(Element *e) {
-       return &e->encoding;
-}
 
-static inline FunctionEncoding *getElementFunctionEncoding(ElementFunction *func) {
-       return &func->functionencoding;
-}
 #endif