Compiles

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

diff --git a/src/AST/element.h b/src/AST/element.h
index d0cec9fbaaa5d262b61c4c419b40b904b61bde7c..c3a3ed9fe2bd764207756b8fdfbc755cd1dfd0cc 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -8,8 +8,6 @@
 #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);
@@ -17,7 +15,8 @@ public:
        Vector<ASTNode *> parents;
        ElementEncoding encoding;
        virtual Element *clone(CSolver *solver, CloneMap *map) {ASSERT(0); return NULL;};
-       MEMALLOC;
+
+       CMEMALLOC;
 };
 
 class ElementConst : public Element {
@@ -26,7 +25,7 @@ public:
        Set *set;
        uint64_t value;
        Element *clone(CSolver *solver, CloneMap *map);
-       MEMALLOC;
+       CMEMALLOC;
 };
 
 class ElementSet : public Element {
@@ -34,18 +33,18 @@ public:
        ElementSet(Set *s);
        Set *set;
        Element *clone(CSolver *solver, CloneMap *map);
-       MEMALLOC;
+       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;
+       CMEMALLOC;
 };
 
 Set *getElementSet(Element *This);