Merge branch 'hamed' into brian

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

diff --git a/src/AST/element.h b/src/AST/element.h
index 4119b7d2f3dede9555fc7767167a3ae9882ac6af..509ee8c3d34566c21faf9f4e8d78d2fca84f6e4d 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -2,28 +2,53 @@
 #define ELEMENT_H
 #include "classlist.h"
 #include "mymemory.h"
-#include "ops.h"
 #include "structs.h"
+#include "astnode.h"
+#include "functionencoding.h"
+#include "elementencoding.h"
+#include "boolean.h"
 
-#define GETELEMENTTYPE(o) (((Element*)o)->type)
-
+#define GETELEMENTTYPE(o) GETASTNODETYPE(o)
+#define GETELEMENTPARENTS(o) (&((Element*)o)->parents)         
 struct Element {
-       ElementType type;
+       ASTNode base;
+       VectorASTNode parents;
 };
 
 struct ElementSet {
-    Element base;
-    Set * set;
+       Element base;
+       Set * set;
+       ElementEncoding encoding;
 };
 
-struct ElementFunction{
-    Element base;
-    Function * function;
-    VectorElement* Elements;
-    Boolean * overflowstatus;
+struct ElementFunction {
+       Element base;
+       Function * function;
+       ArrayElement inputs;
+       Boolean * overflowstatus;
+       FunctionEncoding functionencoding;
+       ElementEncoding domainencoding;
 };
 
 Element * allocElementSet(Set *s);
 Element* allocElementFunction(Function * function, Element ** array, uint numArrays, Boolean * overflowstatus);
 void deleteElement(Element *This);
+Set* getElementSet(Element* This);
+static inline ElementEncoding* getElementEncoding(Element* This){
+       switch(GETELEMENTTYPE(This)){
+               case ELEMSET:
+                       return &((ElementSet*)This)->encoding;
+               case ELEMFUNCRETURN:            
+                       return &((ElementFunction*)This)->domainencoding;
+               default:
+                       ASSERT(0);
+       }
+       return NULL;
+}
+
+
+static inline FunctionEncoding* getElementFunctionEncoding(ElementFunction* func){
+       return &func->functionencoding;
+}
+
 #endif