Split Boolean into separate file

diff --git a/src/Makefile b/src/Makefile
index 6ca77fcb1283293e8c062360825d089b231dc693..ff0452f1062fe541c6abd2d23bdcbbb909719dce 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ PHONY += directories
 MKDIR_P = mkdir -p
 OBJ_DIR = bin
 
-CPP_SOURCES := constraint.cc inc_solver.cc set.cc mutableset.cc element.cc function.cc order.cc table.cc predicate.cc
+CPP_SOURCES := constraint.cc inc_solver.cc set.cc mutableset.cc element.cc function.cc order.cc table.cc predicate.cc boolean.cc
 
 OBJECTS := $(CPP_SOURCES:%.cc=$(OBJ_DIR)/%.o) $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
 

diff --git a/src/boolean.cc b/src/boolean.cc
new file mode 100644 (file)
index 0000000..13070fa
--- /dev/null
+++ b/src/boolean.cc
@@ -0,0 +1 @@
+#include "boolean.h"

diff --git a/src/boolean.h b/src/boolean.h
new file mode 100644 (file)
index 0000000..98e727e
--- /dev/null
+++ b/src/boolean.h
@@ -0,0 +1,11 @@
+#ifndef BOOLEAN_H
+#define BOOLEAN_H
+#include "classlist.h"
+#include "mymemory.h"
+
+class Boolean {
+ public:
+       MEMALLOC;
+ private:
+};
+#endif

diff --git a/src/classlist.h b/src/classlist.h
index cb9f19b65d419c9140143b1c11a0cc40f33f793f..4c48778467f6ea418c822eb0789fb78be3a0e551 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -14,6 +14,7 @@
 #include <inttypes.h>
 
 class Constraint;
+class Boolean;
 class IncrementalSolver;
 class Set;
 class MutableSet;

diff --git a/src/csolver.h b/src/csolver.h
index 1d398ce9b4736aaeab384232258da29f9e9ae35f..b03adb713598e7a1f59a0c0f6e2cc1f4dfb0adc8 100644 (file)
--- a/src/csolver.h
+++ b/src/csolver.h
@@ -6,7 +6,6 @@
 class CSolver {
 public:
        CSolver();
-
        Set * createSet(Type type, uint64_t ** elements);
        Set * createSet(Type type, uint64_t lowrange, uint64_t highrange);
        MutableSet * createMutableSet(Type type);
@@ -18,7 +17,8 @@ public:
        Constraint * getBooleanVar();
 
        Function * createFunctionOperator(enum ArithOp op, Set ** domain, Set * range, enum OverFlowBehavior overflowbehavior, Constraint * overflowstatus);
-       Function * createFunctionOperator(enum ArithOp op);                                                                                                                                                                                                                                                                                                                                                                                                                                                                             //Does Not Overflow
+       //Does Not Overflow
+       Function * createFunctionOperator(enum ArithOp op);
        Predicate * createPredicateOperator(enum CompOp op, Set ** domain);
 
        Table * createTable(Set **domains, Set * range);
@@ -34,6 +34,6 @@ public:
        Order * createOrder(enum OrderType type, Set * set);
        Constraint * orderedConstraint(Order * order, uint64_t first, uint64_t second);
 private:
-
+       ModelVector<Constraint *> constraints;
 };
 #endif

diff --git a/src/mymemory.h b/src/mymemory.h
index 0ce450db171fad6e14373a93cf6200c1b0fe2af0..aabb169bd15ad235812b47dd23869f95ef7dce34 100644 (file)
--- a/src/mymemory.h
+++ b/src/mymemory.h
@@ -34,8 +34,8 @@
        void operator delete[](void *p, size_t size) { \
                model_free(p); \
        } \
-       void * operator new(size_t size, void *p) {     \
-return p;                                                                                                                                                              \
+       void * operator new(size_t size, void *p) {     \
+               return p;                                                                                                                                                               \
        }
 
 void *model_malloc(size_t size);