Commit after resolving conflicts

diff --git a/src/AST/function.h b/src/AST/function.h
index 1ea206935f2708ecf53d080bf4792373a42ee7e5..82379f782d6db72c06ef53f6783237e6841323b2 100644 (file)
--- a/src/AST/function.h
+++ b/src/AST/function.h
@@ -2,9 +2,13 @@
 #define FUNCTION_H
 #include "classlist.h"
 #include "mymemory.h"
-
+#include "ops.h"
+#include "structs.h"
 struct Function {
-
-       Table* table;
+    enum ArithOp op;
+    VectorSet* domains; 
+    Set * range;
+    enum OverFlowBehavior overflowbehavior;
+    Table* table;
 };
 #endif

diff --git a/src/csolver.c b/src/csolver.c
index 26a4be990b02b09edc0f9bf50f3741c2824b5a77..8835fbf1c75939d67614f7d62624dc58bf3bde7f 100644 (file)
--- a/src/csolver.c
+++ b/src/csolver.c
@@ -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));
@@ -83,7 +83,8 @@ Boolean * getBooleanVar(CSolver *solver, VarType type) {
        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;
 }