Bug fix for serializing Boolean Const ...

diff --git a/src/AST/boolean.cc b/src/AST/boolean.cc
index 647f548d352f21e5a98c149ce519b427941099bc..e63549ee409b07e0555675187dda6baaa3e8601b 100644 (file)
--- a/src/AST/boolean.cc
+++ b/src/AST/boolean.cc
@@ -116,6 +116,16 @@ void BooleanVar::serialize(Serializer *serializer) {
        serializer->mywrite(&vtype, sizeof(VarType));
 }
 
+void BooleanConst::serialize(Serializer *serializer) {
+       if (serializer->isSerialized(this))
+               return;
+       serializer->addObject(this);
+       serializer->mywrite(&type, sizeof(ASTNodeType));
+       BooleanConst *This = this;
+       serializer->mywrite(&This, sizeof(BooleanConst *));
+       serializer->mywrite(&istrue, sizeof(bool));
+}
+
 void BooleanVar::print() {
        model_print("BooleanVar<%p>\n", this);
 }

diff --git a/src/AST/boolean.h b/src/AST/boolean.h
index 77dc244001bd99286bef8e7e30a587d6c434e1e6..dd1b58050a3454b68e72f9e627dbb8b4e6c73f9f 100644 (file)
--- a/src/AST/boolean.h
+++ b/src/AST/boolean.h
@@ -35,7 +35,7 @@ public:
        Boolean *clone(CSolver *solver, CloneMap *map);
        bool isTrue() {return istrue;}
        bool isFalse() {return !istrue;}
-       void serialize(Serializer *serializer ) {};
+       void serialize(Serializer *serializer );
        virtual void print();
        bool istrue;
        CMEMALLOC;

diff --git a/src/Serialize/deserializer.cc b/src/Serialize/deserializer.cc
index 2c4d7bb2fee5cbfb76f9fc3c1aa730408d00788f..548619fe221d45a380bb35933b08e08f552dafe1 100644 (file)
--- a/src/Serialize/deserializer.cc
+++ b/src/Serialize/deserializer.cc
@@ -76,6 +76,9 @@ CSolver *Deserializer::deserialize() {
                case BOOLEANVAR:
                        deserializeBooleanVar();
                        break;
+               case BOOLCONST:
+                       deserializeBooleanConst();
+                       break;
                case ORDERCONST:
                        deserializeBooleanOrder();
                        break;
@@ -145,6 +148,15 @@ void Deserializer::deserializeBooleanVar() {
        map.put(b, solver->getBooleanVar(vtype).getBoolean());
 }
 
+void Deserializer::deserializeBooleanConst() {
+       BooleanVar *b;
+       myread(&b, sizeof(BooleanVar *));
+       bool istrue;
+       myread(&istrue, sizeof(bool));
+       map.put(b, istrue?solver->getBooleanTrue().getBoolean():
+                       solver->getBooleanFalse().getBoolean());
+}
+
 void Deserializer::deserializeBooleanOrder() {
        BooleanOrder *bo_ptr;
        myread(&bo_ptr, sizeof(BooleanOrder *));

diff --git a/src/Serialize/deserializer.h b/src/Serialize/deserializer.h
index c56911db614d9a065249d02eeb59c32716fb4845..81baeef65b17e7c34ac8985c7972ff94912acc1f 100644 (file)
--- a/src/Serialize/deserializer.h
+++ b/src/Serialize/deserializer.h
@@ -26,6 +26,7 @@ private:
        ssize_t myread (void *__buf, size_t __nbytes);
        void deserializeBooleanEdge();
        void deserializeBooleanVar();
+       void deserializeBooleanConst();
        void deserializeBooleanOrder();
        void deserializeOrder();
        void deserializeSet();