Merge branch 'hamed' into brian

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

diff --git a/src/AST/element.h b/src/AST/element.h
index 3f9693a9a591f1b61d9c606399a24c3faa3e8ca1..509ee8c3d34566c21faf9f4e8d78d2fca84f6e4d 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -9,8 +9,7 @@
 #include "boolean.h"
 
 #define GETELEMENTTYPE(o) GETASTNODETYPE(o)
-#define GETELEMENTPARENTS(o) (&((Element*)o)->parents)
-               
+#define GETELEMENTPARENTS(o) (&((Element*)o)->parents)         
 struct Element {
        ASTNode base;
        VectorASTNode parents;
@@ -34,8 +33,8 @@ struct ElementFunction {
 Element * allocElementSet(Set *s);
 Element* allocElementFunction(Function * function, Element ** array, uint numArrays, Boolean * overflowstatus);
 void deleteElement(Element *This);
-
-inline ElementEncoding* getElementEncoding(Element* This){
+Set* getElementSet(Element* This);
+static inline ElementEncoding* getElementEncoding(Element* This){
        switch(GETELEMENTTYPE(This)){
                case ELEMSET:
                        return &((ElementSet*)This)->encoding;
@@ -48,10 +47,8 @@ inline ElementEncoding* getElementEncoding(Element* This){
 }
 
 
-inline FunctionEncoding* getElementFunctionEncoding(ElementFunction* func){
+static inline FunctionEncoding* getElementFunctionEncoding(ElementFunction* func){
        return &func->functionencoding;
 }
 
-uint getElementSize(Element* This);
-Constraint * getElementValueConstraint(Element* This, uint64_t value);
 #endif