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

commit after resolving conflicts
---

c393a0d9d17a8bae36b2635544db57fc919db906
diff --cc src/classlist.h
index fc265b5,b53e031..f38b44b
--- a/src/classlist.h
+++ b/src/classlist.h
@@@ -54,9 -54,12 +54,16 @@@ typedef struct ElementEncoding ElementE
  struct FunctionEncoding;
  typedef struct FunctionEncoding FunctionEncoding;
  
 +struct TableEntry;
 +typedef struct TableEntry TableEntry;
 +
++
+ typedef enum ArithOp ArithOp;
+ typedef enum LogicOp LogicOp;
+ typedef enum CompOp CompOp;
+ typedef enum OrderType OrderType;
+ typedef enum OverFlowBehavior OverFlowBehavior;
+ 
  typedef unsigned int uint;
  typedef uint64_t VarType;
  #endif
diff --cc src/csolver.h
index 0093586,d3bce42..aedef93
--- a/src/csolver.h
+++ b/src/csolver.h
@@@ -5,12 -5,17 +5,19 @@@
  #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;
 +	VectorPredicate * allPredicates;
 +	VectorTable * allTables;
  };
  
  /** Create a new solver instance. */