edits
authorbdemsky <bdemsky@uci.edu>
Fri, 16 Jun 2017 20:13:56 +0000 (13:13 -0700)
committerbdemsky <bdemsky@uci.edu>
Fri, 16 Jun 2017 20:13:56 +0000 (13:13 -0700)
src/AST/boolean.c
src/AST/function.h
src/csolver.c
src/csolver.h

index 7373bfc179fe211f8d12016b72563186f8e03c82..a7ffd259841caa1fb3fc1b68e36e5df1e1bc3761 100644 (file)
@@ -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) {
index 82379f782d6db72c06ef53f6783237e6841323b2..61a6148fb9a568d380a42e1d073a4096401e5a48 100644 (file)
@@ -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
index 8835fbf1c75939d67614f7d62624dc58bf3bde7f..1d1413a9c60dcded40c67e2852701ab63f1d6227 100644 (file)
@@ -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;
 }
 
index 15d3f47f305effa88dbd26bb3afed1f4a4303d6d..d11523b2c2ed031252c724dd4d28f6e9b9c84c77 100644 (file)
@@ -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;
 };