Fix warnings, merge, and check my code in

diff --cc src/AST/function.c
index d4b693e3fa71980a20a0770d4de381ec4fc0052c,c9d0717d0212a1060b92233d9a015b79ba47375c..c8163637a905fae6b93f623c9f7812cac8252acc
--- 1/src/AST/function.c
--- 2/src/AST/function.c
+++ b/src/AST/function.c
@@@ -1,1 -1,33 +1,34 @@@
  #include "function.h"
 -    FunctionOperator* This = (FunctionOperator*) ourmalloc(sizeof(FunctionOperator));
 -    GETFUNCTIONTYPE(This)=OPERATORFUNC;
 -    This->domains = allocVectorArraySet(numDomain, domain);
 -    This->op=op;
 -    This->overflowbehavior = overflowbehavior;
 -    This->range=range;
 -    return  &This->base;
+ #include "table.h"
+ #include "set.h"
+ 
+ 
+ Function* allocFunctionOperator( ArithOp op, Set ** domain, uint numDomain, Set * range,OverFlowBehavior overflowbehavior){
 -    FunctionTable* This = (FunctionTable*) ourmalloc(sizeof(FunctionTable));
 -    GETFUNCTIONTYPE(This)=TABLEFUNC;
 -    This->table = table;
++      FunctionOperator* This = (FunctionOperator*) ourmalloc(sizeof(FunctionOperator));
++      GETFUNCTIONTYPE(This)=OPERATORFUNC;
++      This->domains = allocVectorArraySet(numDomain, domain);
++      This->op=op;
++      This->overflowbehavior = overflowbehavior;
++      This->range=range;
++      return &This->base;
+ }
+ 
+ Function* allocFunctionTable (Table* table){
 -    switch( GETFUNCTIONTYPE(This)){
++      FunctionTable* This = (FunctionTable*) ourmalloc(sizeof(FunctionTable));
++      GETFUNCTIONTYPE(This)=TABLEFUNC;
++      This->table = table;
++      return &This->base;
+ }
+ 
+ void deleteFunction(Function* This){
 -          ourfree((FunctionTable*)This);
 -          break;
++      switch(GETFUNCTIONTYPE(This)){
+       case TABLEFUNC:
 -          ourfree((FunctionOperator*) This);
 -          break;
++              ourfree((FunctionTable*)This);
++              break;
+       case OPERATORFUNC:
 -          ASSERT(0);
 -    }
++              ourfree((FunctionOperator*) This);
++              break;
+       default:
++              ASSERT(0);
++      }
+ }

diff --cc src/AST/function.h
index 65a4b29fe3607bc75774808ac65ce4e990b06685,e22ec7524bcb9194418082da8d7f25e4b940141d..3f2a1a9310f2dd077cce62762535455e25c09edb
--- 1/src/AST/function.h
--- 2/src/AST/function.h
+++ b/src/AST/function.h
@@@ -5,11 -5,28 +5,27 @@@
  #include "ops.h"
  #include "structs.h"
  
- struct Function {
-       ArithOp op;
-       VectorSet* domains;
-       Set * range;
-       OverFlowBehavior overflowbehavior;
-       Table* table;
 -
+ #define GETFUNCTIONTYPE(o) (((Function*)o)->type)
+ 
+ struct Function{
+     FunctionType type;
+ };
+ 
+ struct FunctionOperator {
+     Function base;
+     ArithOp op;
+     VectorSet* domains;
+     Set * range;
+     OverFlowBehavior overflowbehavior;
  };
+ 
+ struct FunctionTable{
+     Function base;
+     Table* table;
+ };
+ 
+ Function* allocFunctionOperator( ArithOp op, Set ** domain, uint numDomain, Set * range,OverFlowBehavior overflowbehavior);
+ Function* allocFunctionTable (Table* table);
+ void deleteFunction(Function* This);
+ 
  #endif

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

diff --cc src/Encoders/functionencoding.c
Simple merge

diff --cc src/classlist.h
Simple merge

diff --cc src/csolver.c
index 7179222096c54ab17af4cb31b5f2ec50e74659b8,62f4acdeaf472e3bc6b274698fba7d0c6bfeba1b..7a9d1e0d2870ce3c87d4adf828fc9665655af3a4
--- 1/src/csolver.c
--- 2/src/csolver.c
+++ b/src/csolver.c
@@@ -41,8 -44,24 +44,24 @@@ void deleteSolver(CSolver *This) 
        for(uint i=0;i<size;i++) {
                deleteElement(getVectorElement(This->allElements, i));
        }
-       //FIXME: Freeing alltables and allpredicates
-       deleteVectorElement(This->allElements);
+       size=getSizeVectorTable(This->allTables);
+       for(uint i=0;i<size;i++) {
+               deleteTable(getVectorTable(This->allTables, i));
+       }
+       size=getSizeVectorPredicate(This->allPredicates);
+       for(uint i=0;i<size;i++) {
+               deletePredicate(getVectorPredicate(This->allPredicates, i));
+       }
+       size=getSizeVectorOrder(This->allOrders);
+       for(uint i=0;i<size;i++) {
+               deleteOrder(getVectorOrder(This->allOrders, i));
+       }
+       deleteVectorOrder(This->allOrders);
+       size=getSizeVectorFunction(This->allFunctions);
+       for(uint i=0;i<size;i++) {
+               deleteFunction(getVectorFunction(This->allFunctions, i));
+       }
 -      deleteVectorOrder(This->allFunctions);
++      deleteVectorFunction(This->allFunctions);
        ourfree(This);
  }