Commit after resolving conflicts

diff --cc src/AST/boolean.c
Simple merge

diff --cc src/AST/boolean.h
Simple merge

diff --cc src/AST/element.c
index 903256d61f7e5fd1555fe77aae066eebbe00c6a3,df29cfecc00e69d3a22ba7a4038e2b478a5e14f3..3746d250f10e748119f485fd14ecc082de9940d2
--- 1/src/AST/element.c
--- 2/src/AST/element.c
+++ b/src/AST/element.c
@@@ -1,22 -1,12 +1,23 @@@
  #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;
-       return &tmp->base;
+       tmp->encoding=NULL;
+       return tmp;
  }
  
 +Element* allocElementFunction(Function * function, Element ** array, uint numArrays, Boolean * overflowstatus){
 +    ElementFunction* ef = (ElementFunction*) ourmalloc(sizeof(ElementFunction));
 +    GETELEMENTTYPE(ef)= ELEMFUNCRETURN;
 +    ef->function=function;
 +    ef->overflowstatus = overflowstatus;
 +    ef->Elements = allocVectorArrayElement(numArrays, array);
 +    return &ef->base;
 +}
 +
  void deleteElement(Element *This) {
        ourfree(This);
  }

diff --cc src/AST/element.h
index 4119b7d2f3dede9555fc7767167a3ae9882ac6af,91d19dba19fe6830d63334f2630ca594a08dde4d..0a23d8889d2a88d9a310934b3ea3788374cdfa8c
--- 1/src/AST/element.h
--- 2/src/AST/element.h
+++ b/src/AST/element.h
@@@ -2,28 -2,12 +2,31 @@@
  #define ELEMENT_H
  #include "classlist.h"
  #include "mymemory.h"
 +#include "ops.h"
 +#include "structs.h"
  
 +#define GETELEMENTTYPE(o) (((Element*)o)->type)
 +
++//FIXME:TALK ABOUT ELEMENT
  struct Element {
-       ElementType type;
++      ElementType type;
+       Set * set;
+       ElementEncoding * encoding;
  };
  
- Element * allocElementSet(Set *s);
 +struct ElementSet {
 +    Element base;
 +    Set * set;
 +};
 +
 +struct ElementFunction{
 +    Element base;
 +    Function * function;
 +    VectorElement* Elements;
 +    Boolean * overflowstatus;
 +};
 +
+ Element * allocElement(Set *s);
 +Element* allocElementFunction(Function * function, Element ** array, uint numArrays, Boolean * overflowstatus);
  void deleteElement(Element *This);
  #endif

diff --cc src/AST/ops.h
Simple merge

diff --cc src/classlist.h
index 14f43f80c57f857c7547a156fe796b3d30ab9054,237d529be962f45906e0fc00918247152f05e74b..3306ffe311b5e148e13824f9f5931109e7961704
--- 1/src/classlist.h
--- 2/src/classlist.h
+++ b/src/classlist.h
@@@ -36,12 -38,8 +39,11 @@@ typedef struct IncrementalSolver Increm
  
  struct Set;
  typedef struct Set Set;
- 
  typedef struct Set MutableSet;
  
 +typedef struct ElementFunction ElementFunction;
 +typedef struct ElementSet ElementSet;
 +
  struct Element;
  typedef struct Element Element;
  

diff --cc src/csolver.c
Simple merge