Edits to merge

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

diff --git a/src/AST/boolean.cc b/src/AST/boolean.cc
index 58bc05eaadaf550364bda3f7fe66a8218b3d8f88..fff3658abb16bc404bd0d40f8c3f9c6db5d593aa 100644 (file)
--- a/src/AST/boolean.cc
+++ b/src/AST/boolean.cc
@@ -104,18 +104,108 @@ void BooleanVar::serialize(Serializer* serializer){
                return;
        serializer->addObject(this);
        serializer->mywrite(&type, sizeof(ASTNodeType));
-       serializer->mywrite(this, sizeof(BooleanVar*));
+       BooleanVar* This = this;
+       serializer->mywrite(&This, sizeof(BooleanVar*));
        serializer->mywrite(&vtype, sizeof(VarType));
 }
 
+void BooleanVar::print(){
+       model_print("BooleanVar:%lu\n", (uintptr_t)this);
+}
+
+void BooleanConst::print(){
+       model_print("BooleanConst:%s\n", istrue?"TRUE" :"FALSE");
+}
+
 void BooleanOrder::serialize(Serializer* serializer){
        if(serializer->isSerialized(this))
                return;
        serializer->addObject(this);
-//     order->serialize(serializer);
+       order->serialize(serializer);
+       
        serializer->mywrite(&type, sizeof(ASTNodeType));
-       serializer->mywrite(this, sizeof(BooleanOrder*));
+       BooleanOrder* This = this;
+       serializer->mywrite(&This, sizeof(BooleanOrder*));
        serializer->mywrite(&order, sizeof(Order*));
        serializer->mywrite(&first, sizeof(uint64_t));
        serializer->mywrite(&second, sizeof(uint64_t));
 }
+
+void BooleanOrder::print(){
+       model_print("{BooleanOrder: First= %lu, Second = %lu on Order:\n", first, second);
+       order->print();
+       model_print("}\n");
+}
+
+void BooleanPredicate::serialize(Serializer* serializer){
+       if(serializer->isSerialized(this))
+               return;
+       serializer->addObject(this);
+       
+       predicate->serialize(serializer);
+       uint size = inputs.getSize();
+       for(uint i=0; i<size; i++){
+               Element* input = inputs.get(i);
+               input->serialize(serializer);
+       }
+       serializeBooleanEdge(serializer, undefStatus);
+       
+       serializer->mywrite(&type, sizeof(ASTNodeType));
+       BooleanPredicate* This = this;
+       serializer->mywrite(&This, sizeof(BooleanPredicate*));
+       serializer->mywrite(&predicate, sizeof(Predicate *));
+       serializer->mywrite(&size, sizeof(uint));
+       for(uint i=0; i<size; i++){
+               Element *input = inputs.get(i);
+               serializer->mywrite(&input, sizeof(Element *));
+       }
+       Boolean* undefStat = undefStatus!= BooleanEdge(NULL)?undefStatus.getRaw() : NULL;
+       serializer->mywrite(&undefStat, sizeof(Boolean*));
+}
+
+void BooleanPredicate::print(){
+       model_print("{BooleanPredicate:\n");
+       predicate->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");
+}
+
+void BooleanLogic::serialize(Serializer* serializer){
+       if(serializer->isSerialized(this))
+               return;
+       serializer->addObject(this);
+       uint size = inputs.getSize();
+       for(uint i=0; i<size; i++){
+               BooleanEdge input = inputs.get(i);
+               serializeBooleanEdge(serializer, input);
+       }
+       serializer->mywrite(&type, sizeof(ASTNodeType));
+       BooleanLogic* This = this;
+       serializer->mywrite(&This, sizeof(BooleanLogic*));
+       serializer->mywrite(&op, sizeof(LogicOp));
+       serializer->mywrite(&size, sizeof(uint));
+       for(uint i=0; i<size; i++){
+               Boolean* input = inputs.get(i).getRaw();
+               serializer->mywrite(&input, sizeof(Boolean*));
+       }
+}
+
+void BooleanLogic::print(){
+       model_print("{BooleanLogic: %s\n", 
+                                                       op ==SATC_AND? "AND": op == SATC_OR? "OR": op==SATC_NOT? "NOT":
+                                                       op == SATC_XOR? "XOR" : op==SATC_IFF? "IFF" : "IMPLIES");
+       uint size = inputs.getSize();
+       for(uint i=0; i<size; i++){
+               BooleanEdge input = inputs.get(i);
+               if(input.isNegated())
+                       model_print("!");
+               input.getBoolean()->print();
+       }
+       model_print("}\n");
+}
+