Commit after resolving conflicts

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

diff --git a/src/AST/element.h b/src/AST/element.h
index 4119b7d2f3dede9555fc7767167a3ae9882ac6af..0a23d8889d2a88d9a310934b3ea3788374cdfa8c 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -7,8 +7,11 @@
 
 #define GETELEMENTTYPE(o) (((Element*)o)->type)
 
+//FIXME:TALK ABOUT ELEMENT
 struct Element {
-       ElementType type;
+       ElementType type;
+       Set * set;
+       ElementEncoding * encoding;
 };
 
 struct ElementSet {
@@ -23,7 +26,7 @@ struct ElementFunction{
     Boolean * overflowstatus;
 };
 
-Element * allocElementSet(Set *s);
+Element * allocElement(Set *s);
 Element* allocElementFunction(Function * function, Element ** array, uint numArrays, Boolean * overflowstatus);
 void deleteElement(Element *This);
 #endif