projects
/
satune.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commit after resolving conflicts
[satune.git]
/
src
/
classlist.h
diff --git
a/src/classlist.h
b/src/classlist.h
index f38b44bc5cbe3422c1951ffeecc8d44ff0ef9555..3306ffe311b5e148e13824f9f5931109e7961704 100644
(file)
--- a/
src/classlist.h
+++ b/
src/classlist.h
@@
-18,10
+18,19
@@
struct CSolver;
typedef struct CSolver CSolver;
struct CSolver;
typedef struct CSolver CSolver;
+struct SATEncoder;
+typedef struct SATEncoder SATEncoder;
+
struct Constraint;
typedef struct Constraint Constraint;
struct Constraint;
typedef struct Constraint Constraint;
+typedef struct BooleanOrder BooleanOrder;
+typedef struct BooleanVar BooleanVar;
+typedef struct BooleanLogic BooleanLogic;
+typedef struct BooleanComp BooleanComp;
+typedef struct BooleanPredicate BooleanPredicate;
+
struct Boolean;
typedef struct Boolean Boolean;
struct Boolean;
typedef struct Boolean Boolean;
@@
-30,12
+39,17
@@
typedef struct IncrementalSolver IncrementalSolver;
struct Set;
typedef struct Set Set;
struct Set;
typedef struct Set Set;
-
typedef struct Set MutableSet;
typedef struct Set MutableSet;
+typedef struct ElementFunction ElementFunction;
+typedef struct ElementSet ElementSet;
+
struct Element;
typedef struct Element Element;
struct Element;
typedef struct Element Element;
+typedef struct FunctionOperator FunctionOperator;
+typedef struct FunctionTable FunctionTable;
+
struct Function;
typedef struct Function Function;
struct Function;
typedef struct Function Function;
@@
-54,16
+68,12
@@
typedef struct ElementEncoding ElementEncoding;
struct FunctionEncoding;
typedef struct FunctionEncoding FunctionEncoding;
struct FunctionEncoding;
typedef struct FunctionEncoding FunctionEncoding;
+struct OrderEncoding;
+typedef struct OrderEncoding OrderEncoding;
+
struct TableEntry;
typedef struct TableEntry TableEntry;
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
typedef unsigned int uint;
typedef uint64_t VarType;
#endif