From: Hamed <hamed.gorjiara@gmail.com>
Date: Fri, 16 Jun 2017 19:03:16 +0000 (-0700)
Subject: Commit after resolving conflicts
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=commitdiff_plain;h=f157726420ac92c6b29ab7b552682629d0f3c4a4

Commit after resolving conflicts
---

f157726420ac92c6b29ab7b552682629d0f3c4a4
diff --cc src/AST/function.h
index 0000000,1ea2069..82379f7
mode 000000,100644..100644
--- a/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"
 -
++#include "ops.h"
++#include "structs.h"
+ struct Function {
 -
 -	Table* table;
++    enum ArithOp op;
++    VectorSet* domains; 
++    Set * range;
++    enum OverFlowBehavior overflowbehavior;
++    Table* table;
+ };
+ #endif
diff --cc src/csolver.c
index 5ddaaed,26a4be9..8835fbf
--- a/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;
  }