Bug fix for cloning ...

[satune.git] / src / AST / element.cc

diff --git a/src/AST/element.cc b/src/AST/element.cc
index ca42290953e7495126f37aaea3f8161236b2b193..565187afc1ab5996f85be63b8a4c8a79790b2223 100644 (file)
--- a/src/AST/element.cc
+++ b/src/AST/element.cc
@@ -43,7 +43,7 @@ Element *ElementSet::clone(CSolver *solver, CloneMap *map) {
        if (e != NULL)
                return e;
        e = solver->getElementVar(set->clone(solver, map));
-       map->put(e, e);
+       map->put(this, e);
        return e;
 }
 
@@ -52,14 +52,97 @@ Element *ElementFunction::clone(CSolver *solver, CloneMap *map) {
        for (uint i = 0; i < inputs.getSize(); i++) {
                array[i] = inputs.get(i)->clone(solver, map);
        }
-       Element *e = solver->applyFunction(function->clone(solver, map), array, inputs.getSize(), overflowstatus->clone(solver, map));
+       BooleanEdge ofstatus = overflowstatus ? cloneEdge(solver, map, overflowstatus) : BooleanEdge();
+       Element *e = solver->applyFunction(function->clone(solver, map), array, inputs.getSize(), ofstatus);
        return e;
 }
 
 void ElementFunction::updateParents() {
-       for(uint i=0;i < inputs.getSize(); i++) inputs.get(i)->parents.push(this);
+       for (uint i = 0; i < inputs.getSize(); i++) inputs.get(i)->parents.push(this);
 }
 
-Set * ElementFunction::getRange() {
+Set *ElementFunction::getRange() {
        return function->getRange();
 }
+
+void ElementSet::serialize(Serializer *serializer) {
+       if (serializer->isSerialized(this))
+               return;
+       serializer->addObject(this);
+
+       set->serialize(serializer);
+
+       serializer->mywrite(&type, sizeof(ASTNodeType));
+       ElementSet *This = this;
+       serializer->mywrite(&This, sizeof(ElementSet *));
+       serializer->mywrite(&set, sizeof(Set *));
+}
+
+void ElementSet::print() {
+       model_print("{ElementSet<%p>:", this);
+       set->print();
+       model_print(" %p ", this);
+       getElementEncoding()->print();
+       model_print("}");
+}
+
+void ElementConst::serialize(Serializer *serializer) {
+       if (serializer->isSerialized(this))
+               return;
+       serializer->addObject(this);
+
+       set->serialize(serializer);
+
+       serializer->mywrite(&type, sizeof(ASTNodeType));
+       ElementSet *This = this;
+       serializer->mywrite(&This, sizeof(ElementSet *));
+       VarType type = set->getType();
+       serializer->mywrite(&type, sizeof(VarType));
+       serializer->mywrite(&value, sizeof(uint64_t));
+}
+
+void ElementConst::print() {
+       model_print("{ElementConst<%p>: %" PRIu64 "}\n", this, value);
+}
+
+void ElementFunction::serialize(Serializer *serializer) {
+       if (serializer->isSerialized(this))
+               return;
+       serializer->addObject(this);
+
+       function->serialize(serializer);
+       uint size = inputs.getSize();
+       for (uint i = 0; i < size; i++) {
+               Element *input = inputs.get(i);
+               input->serialize(serializer);
+       }
+       serializeBooleanEdge(serializer, overflowstatus);
+
+       serializer->mywrite(&type, sizeof(ASTNodeType));
+       ElementFunction *This = this;
+       serializer->mywrite(&This, sizeof(ElementFunction *));
+       serializer->mywrite(&function, sizeof(Function *));
+       serializer->mywrite(&size, sizeof(uint));
+       for (uint i = 0; i < size; i++) {
+               Element *input = inputs.get(i);
+               serializer->mywrite(&input, sizeof(Element *));
+       }
+       Boolean *overflowstat = overflowstatus.getRaw();
+       serializer->mywrite(&overflowstat, sizeof(Boolean *));
+}
+
+void ElementFunction::print() {
+       model_print("{ElementFunction<%p>:\n", this);
+       function->print();
+       model_print("OverFlow Boolean Flag:\n");
+       overflowstatus.getBoolean()->print();
+       model_print("Range:\n");
+       getRange()->print();
+       model_print("Elements:\n");
+       uint size = inputs.getSize();
+       for (uint i = 0; i < size; i++) {
+               Element *input = inputs.get(i);
+               input->print();
+       }
+       model_print("}\n");
+}