Adding support for (de)serializing MutableSet

diff --git a/src/AST/mutableset.h b/src/AST/mutableset.h
index 568678f5cea381f9e66840f56f174bda088e6b73..c608f3fd6f1c2f0794bd634260dda1cd81247d87 100644 (file)
--- a/src/AST/mutableset.h
+++ b/src/AST/mutableset.h
@@ -7,6 +7,7 @@ public:
        MutableSet(VarType t);
        void addElementMSet(uint64_t element);
        Set *clone(CSolver *solver, CloneMap *map);
        MutableSet(VarType t);
        void addElementMSet(uint64_t element);
        Set *clone(CSolver *solver, CloneMap *map);

+       bool isMutableSet() {return true;}

        CMEMALLOC;
 };
 #endif
        CMEMALLOC;
 };
 #endif

diff --git a/src/AST/set.cc b/src/AST/set.cc
index 54c66798f9889d3dda6fb433f5c9b56d3547947e..fc8bf150f0bd3433caa3798eb8d0c0196fede809 100644 (file)
--- a/src/AST/set.cc
+++ b/src/AST/set.cc
@@ -95,6 +95,8 @@ void Set::serialize(Serializer* serializer){
        serializer->mywrite(&isRange, sizeof(bool));
        serializer->mywrite(&low, sizeof(uint64_t));
        serializer->mywrite(&high, sizeof(uint64_t));
        serializer->mywrite(&isRange, sizeof(bool));
        serializer->mywrite(&low, sizeof(uint64_t));
        serializer->mywrite(&high, sizeof(uint64_t));

+       bool isMutable = isMutableSet();
+       serializer->mywrite(&isMutable, sizeof(bool));

        uint size = members->getSize();
        serializer->mywrite(&size, sizeof(uint));
        for(uint i=0; i<size; i++){
        uint size = members->getSize();
        serializer->mywrite(&size, sizeof(uint));
        for(uint i=0; i<size; i++){

diff --git a/src/AST/set.h b/src/AST/set.h
index 6dbeac063f999b3e611cc3816f36b15eb87d5050..efd281d77ae7effdd59ef2a38c570a380a4c821b 100644 (file)
--- a/src/AST/set.h
+++ b/src/AST/set.h
@@ -24,6 +24,7 @@ public:
        uint64_t getNewUniqueItem() {return low++;}
        uint64_t getMemberAt(uint index);
        uint64_t getElement(uint index);
        uint64_t getNewUniqueItem() {return low++;}
        uint64_t getMemberAt(uint index);
        uint64_t getElement(uint index);

+       virtual bool isMutableSet() {return false;}

        virtual Set *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serializer);
        CMEMALLOC;
        virtual Set *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serializer);
        CMEMALLOC;

diff --git a/src/Serialize/deserializer.cc b/src/Serialize/deserializer.cc
index 71191198ee10781658094602f0dbbd10620ca40c..fc4cd7bab1faa3f30191d05c9ebe8385830b57f4 100644 (file)
--- a/src/Serialize/deserializer.cc
+++ b/src/Serialize/deserializer.cc
@@ -13,6 +13,7 @@
 #include "predicate.h"
 #include "table.h"
 #include "element.h"
 #include "predicate.h"
 #include "table.h"
 #include "element.h"

+#include "mutableset.h"

 
 Deserializer::Deserializer(const char* file):
        solver(new CSolver())
 
 Deserializer::Deserializer(const char* file):
        solver(new CSolver())


@@ -148,16 +149,28 @@ void Deserializer::deserializeSet(){
        myread(&low, sizeof(uint64_t));
        uint64_t high;
        myread(&high, sizeof(uint64_t));
        myread(&low, sizeof(uint64_t));
        uint64_t high;
        myread(&high, sizeof(uint64_t));

+       bool isMutable;
+       myread(&isMutable, sizeof(bool));
+       Set *set;
+       if(isMutable){
+               set = new MutableSet(type);
+       }

        uint size;
        myread(&size, sizeof(uint));
        Vector<uint64_t> members;
        for(uint i=0; i<size; i++){
                uint64_t mem;
                myread(&mem, sizeof(uint64_t));
        uint size;
        myread(&size, sizeof(uint));
        Vector<uint64_t> members;
        for(uint i=0; i<size; i++){
                uint64_t mem;
                myread(&mem, sizeof(uint64_t));

-               members.push(mem);
+               if(isMutable) {
+                       ((MutableSet*) set)->addElementMSet(mem);
+               }else {
+                       members.push(mem);
+               }
+       }
+       if(!isMutable){
+               set = isRange? solver->createRangeSet(type, low, high):
+                       solver->createSet(type, members.expose(), size);

        }
        }

-       Set *set = isRange? solver->createRangeSet(type, low, high):
-               solver->createSet(type, members.expose(), size);

        map.put(s_ptr, set);
 }
 
        map.put(s_ptr, set);
 }