Commit after resolving conflicts

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

diff --git a/src/AST/element.c b/src/AST/element.c
index 903256d61f7e5fd1555fe77aae066eebbe00c6a3..3746d250f10e748119f485fd14ecc082de9940d2 100644 (file)
--- a/src/AST/element.c
+++ b/src/AST/element.c
@@ -1,11 +1,12 @@
 #include "element.h"
 #include "structs.h"
 #include "element.h"
 #include "structs.h"

-
-Element *allocElementSet(Set * s) {
-       ElementSet * tmp=(ElementSet *)ourmalloc(sizeof(ElementSet));
+//FIXME: ELEMENTSET?
+Element *allocElement(Set * s) {
+       Element * tmp=(Element *)ourmalloc(sizeof(Element));

        GETELEMENTTYPE(tmp)= ELEMSET;
        tmp->set=s;
        GETELEMENTTYPE(tmp)= ELEMSET;
        tmp->set=s;

-       return &tmp->base;
+       tmp->encoding=NULL;
+       return tmp;

 }
 
 Element* allocElementFunction(Function * function, Element ** array, uint numArrays, Boolean * overflowstatus){
 }
 
 Element* allocElementFunction(Function * function, Element ** array, uint numArrays, Boolean * overflowstatus){