From aa6bbd899ac65d2d7106f611a22abd2312d00ca2 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Fri, 16 Jun 2017 13:13:56 -0700 Subject: [PATCH] edits --- src/AST/boolean.c | 24 ++++++++++++------------ src/AST/function.h | 10 +++++----- src/csolver.c | 14 +++++++------- src/csolver.h | 7 +++++++ 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/AST/boolean.c b/src/AST/boolean.c index 7373bfc..a7ffd25 100644 --- a/src/AST/boolean.c +++ b/src/AST/boolean.c @@ -1,19 +1,19 @@ #include "boolean.h" -Boolean* allocBoolean(VarType t){ - Boolean* tmp = (Boolean*) ourmalloc(sizeof (Boolean)); - tmp->vtype=t; - tmp->btype=_BOOLEAN; - return tmp; +Boolean* allocBoolean(VarType t) { + Boolean* tmp=(Boolean*) ourmalloc(sizeof (Boolean)); + tmp->vtype=t; + tmp->btype=_BOOLEAN; + return tmp; } -Boolean* allocBooleanOrder(Order* order,uint64_t first, uint64_t second){ - Boolean* tmp = (Boolean*) ourmalloc(sizeof (Boolean)); - tmp->btype= _ORDER; - tmp->order = order; - tmp->first=first; - tmp->second=second; - return tmp; +Boolean* allocBooleanOrder(Order* order,uint64_t first, uint64_t second) { + Boolean* tmp=(Boolean*) ourmalloc(sizeof (Boolean)); + tmp->btype=_ORDER; + tmp->order=order; + tmp->first=first; + tmp->second=second; + return tmp; } void deleteBoolean(Boolean * this) { diff --git a/src/AST/function.h b/src/AST/function.h index 82379f7..61a6148 100644 --- a/src/AST/function.h +++ b/src/AST/function.h @@ -5,10 +5,10 @@ #include "ops.h" #include "structs.h" struct Function { - enum ArithOp op; - VectorSet* domains; - Set * range; - enum OverFlowBehavior overflowbehavior; - 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 8835fbf..1d1413a 100644 --- a/src/csolver.c +++ b/src/csolver.c @@ -1,10 +1,10 @@ #include "csolver.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" +#include "set.h" +#include "mutableset.h" +#include "element.h" +#include "boolean.h" +#include "predicate.h" +#include "order.h" CSolver * allocCSolver() { CSolver * tmp=(CSolver *) ourmalloc(sizeof(CSolver)); @@ -84,7 +84,7 @@ Boolean * getBooleanVar(CSolver *solver, VarType type) { } Function * createFunctionOperator(CSolver *solver, enum ArithOp op, Set ** domain, uint numDomain, Set * range, - enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) { + enum OverFlowBehavior overflowbehavior, Boolean * overflowstatus) { return NULL; } diff --git a/src/csolver.h b/src/csolver.h index 15d3f47..d11523b 100644 --- a/src/csolver.h +++ b/src/csolver.h @@ -5,9 +5,16 @@ #include "structs.h" struct CSolver { + /** This is a vector of constraints that must be satisfied. */ VectorBoolean * constraints; + + /** This is a vector of all boolean structs that we have allocated. */ VectorBoolean * allBooleans; + + /** This is a vector of all set structs that we have allocated. */ VectorSet * allSets; + + /** This is a vector of all element structs that we have allocated. */ VectorElement * allElements; }; -- 2.34.1