Commit after resolving conflicts

diff --cc src/AST/function.h
index 0000000000000000000000000000000000000000,1ea206935f2708ecf53d080bf4792373a42ee7e5..82379f782d6db72c06ef53f6783237e6841323b2
mode 000000,100644..100644
--- /dev/null
--- 2/src/AST/function.h
+++ b/src/AST/function.h
@@@ -1,0 -1,10 +1,14 @@@
 -
+ #ifndef FUNCTION_H
+ #define FUNCTION_H
+ #include "classlist.h"
+ #include "mymemory.h"
 -
 -      Table* table;
++#include "ops.h"
++#include "structs.h"
+ struct Function {
++    enum ArithOp op;
++    VectorSet* domains; 
++    Set * range;
++    enum OverFlowBehavior overflowbehavior;
++    Table* table;
+ };
+ #endif

diff --cc src/csolver.c
index 5ddaaeda13e13e79db6bb291f2705418217241c4,26a4be990b02b09edc0f9bf50f3741c2824b5a77..8835fbf1c75939d67614f7d62624dc58bf3bde7f
--- 1/src/csolver.c
--- 2/src/csolver.c
+++ b/src/csolver.c
@@@ -1,9 -1,10 +1,10 @@@
  #include "csolver.h"
--#include "set.h"
--#include "mutableset.h"
--#include "element.h"
--#include "boolean.h"
--#include "predicate.h"
 -#include "order.h"
++#include "AST/set.h"
++#include "AST/mutableset.h"
++#include "AST/element.h"
++#include "AST/boolean.h"
++#include "AST/predicate.h"
++#include "AST/order.h"
  
  CSolver * allocCSolver() {
        CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver));
@@@ -68,13 -78,12 +78,13 @@@ Element * getElementVar(CSolver *this, 
  }
  
  Boolean * getBooleanVar(CSolver *solver, VarType type) {
-     Boolean* boolean= allocBoolean(type);
-     pushVectorBoolean(solver->constraints, boolean);
-     return boolean;
+       Boolean* boolean= allocBoolean(type);
+       pushVectorBoolean(solver->allBooleans, boolean);
+       return boolean;
  }
  
 -Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, uint numDomain, Set * range, enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
 +Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, uint numDomain, Set * range,
 +        enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) {
        return NULL;
  }