commit after resolving conflicts

diff --cc src/classlist.h
index fc265b579577b9e0978d139fc3038c61d7f079dc,b53e0312cf7ee93e3aff5c86984eabda5abbef70..f38b44bc5cbe3422c1951ffeecc8d44ff0ef9555
--- 1/src/classlist.h
--- 2/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.c
Simple merge

diff --cc src/csolver.h
index 0093586600778d9c34bc4615884df69a45f3f25d,d3bce42f5cef554247fdd76ee3027d172c84dd31..aedef9391ea27c586b5b838e38c1cbf21611cb5a
--- 1/src/csolver.h
--- 2/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. */