Fixing missing changes

diff --git a/src/AST/boolean.h b/src/AST/boolean.h
index 6449a8e0f0eed13ff7559839123d25b937442f19..3674d9f29d5e934bd94e90ecd1dfe93a488b3e9c 100644 (file)
--- a/src/AST/boolean.h
+++ b/src/AST/boolean.h
@@ -16,6 +16,7 @@ public:
        virtual ~Boolean() {}
        virtual Boolean *clone(CSolver *solver, CloneMap *map) = 0;
        virtual void serialize(Serializer* ) = 0;
        virtual ~Boolean() {}
        virtual Boolean *clone(CSolver *solver, CloneMap *map) = 0;
        virtual void serialize(Serializer* ) = 0;

+        virtual void print() =0;

        virtual bool isTrue() {return boolVal == BV_MUSTBETRUE;}
        virtual bool isFalse() {return boolVal == BV_MUSTBEFALSE;}
        Polarity polarity;
        virtual bool isTrue() {return boolVal == BV_MUSTBETRUE;}
        virtual bool isFalse() {return boolVal == BV_MUSTBEFALSE;}
        Polarity polarity;


@@ -33,7 +34,7 @@ public:
        bool isTrue() {return istrue;}
        bool isFalse() {return !istrue;}
        void serialize(Serializer *serializer ){};
        bool isTrue() {return istrue;}
        bool isFalse() {return !istrue;}
        void serialize(Serializer *serializer ){};

-       
+        virtual void print();

        bool istrue;
        CMEMALLOC;
 };
        bool istrue;
        CMEMALLOC;
 };


@@ -43,7 +44,7 @@ public:
        BooleanVar(VarType t);
        Boolean *clone(CSolver *solver, CloneMap *map);
        void serialize(Serializer *serializer );
        BooleanVar(VarType t);
        Boolean *clone(CSolver *solver, CloneMap *map);
        void serialize(Serializer *serializer );

-       
+        virtual void print();

        VarType vtype;
        Edge var;
        CMEMALLOC;
        VarType vtype;
        Edge var;
        CMEMALLOC;


@@ -54,7 +55,8 @@ public:
        BooleanOrder(Order *_order, uint64_t _first, uint64_t _second);
        Boolean *clone(CSolver *solver, CloneMap *map);
        void serialize(Serializer *serializer );
        BooleanOrder(Order *_order, uint64_t _first, uint64_t _second);
        Boolean *clone(CSolver *solver, CloneMap *map);
        void serialize(Serializer *serializer );

-       
+        virtual void print();
+

        Order *order;
        uint64_t first;
        uint64_t second;
        Order *order;
        uint64_t first;
        uint64_t second;


@@ -69,7 +71,7 @@ public:
        FunctionEncoding *getFunctionEncoding() {return &encoding;}
        void updateParents();
        void serialize(Serializer *serializer );
        FunctionEncoding *getFunctionEncoding() {return &encoding;}
        void updateParents();
        void serialize(Serializer *serializer );

-       
+        virtual void print();

        CMEMALLOC;
 
        Predicate *predicate;
        CMEMALLOC;
 
        Predicate *predicate;


@@ -83,7 +85,7 @@ public:
        BooleanLogic(CSolver *solver, LogicOp _op, BooleanEdge *array, uint asize);
        Boolean *clone(CSolver *solver, CloneMap *map);
        void serialize(Serializer *serializer );
        BooleanLogic(CSolver *solver, LogicOp _op, BooleanEdge *array, uint asize);
        Boolean *clone(CSolver *solver, CloneMap *map);
        void serialize(Serializer *serializer );

-       
+        virtual void print();

        LogicOp op;
        bool replaced;
        Array<BooleanEdge> inputs;
        LogicOp op;
        bool replaced;
        Array<BooleanEdge> inputs;

diff --git a/src/AST/element.h b/src/AST/element.h
index 72b2ea636c47b238b38a75ebf5dba316c2ac413c..b045186637cc426dd7263de01fefa190f95ad728 100644 (file)
--- a/src/AST/element.h
+++ b/src/AST/element.h
@@ -17,6 +17,7 @@ public:
        inline ElementEncoding *getElementEncoding(){ return &encoding; }
        virtual Element *clone(CSolver *solver, CloneMap *map) {ASSERT(0); return NULL;};
        virtual void serialize(Serializer* serializer) =0;
        inline ElementEncoding *getElementEncoding(){ return &encoding; }
        virtual Element *clone(CSolver *solver, CloneMap *map) {ASSERT(0); return NULL;};
        virtual void serialize(Serializer* serializer) =0;

+        virtual void print();

        virtual void updateParents() {}
        virtual Set * getRange() = 0;
        CMEMALLOC;
        virtual void updateParents() {}
        virtual Set * getRange() = 0;
        CMEMALLOC;


@@ -28,6 +29,7 @@ public:
        ElementSet(Set *s);
        virtual Element *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serializer);
        ElementSet(Set *s);
        virtual Element *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serializer);

+        virtual void print();

        CMEMALLOC;
        Set *getRange() {return set;}
  protected:
        CMEMALLOC;
        Set *getRange() {return set;}
  protected:


@@ -40,6 +42,7 @@ public:
        ElementConst(uint64_t value, Set *_set);
        uint64_t value;
        virtual void serialize(Serializer* serializer);
        ElementConst(uint64_t value, Set *_set);
        uint64_t value;
        virtual void serialize(Serializer* serializer);

+        virtual void print();

        Element *clone(CSolver *solver, CloneMap *map);
        CMEMALLOC;
 };
        Element *clone(CSolver *solver, CloneMap *map);
        CMEMALLOC;
 };


@@ -52,6 +55,7 @@ public:
        FunctionEncoding functionencoding;
        Element *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serializer);
        FunctionEncoding functionencoding;
        Element *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serializer);

+        virtual void print();

        Set * getRange();
        void updateParents();
        Function * getFunction() {return function;}
        Set * getRange();
        void updateParents();
        Function * getFunction() {return function;}

diff --git a/src/AST/function.h b/src/AST/function.h
index 98ef53641b926a0b78132e5ee65ffcfd3cce95a6..b8d0c78267cd22d4850b342d93a71fed303d56fd 100644 (file)
--- a/src/AST/function.h
+++ b/src/AST/function.h
@@ -13,6 +13,7 @@ public:
        virtual ~Function() {}
        virtual Function *clone(CSolver *solver, CloneMap *map) {ASSERT(0); return NULL;}
        virtual void serialize(Serializer* serialiezr) =0;
        virtual ~Function() {}
        virtual Function *clone(CSolver *solver, CloneMap *map) {ASSERT(0); return NULL;}
        virtual void serialize(Serializer* serialiezr) =0;

+        virtual void print() = 0;

        virtual Set * getRange() = 0;
        CMEMALLOC;
 };
        virtual Set * getRange() = 0;
        CMEMALLOC;
 };


@@ -28,6 +29,7 @@ public:
        bool isInRangeFunction(uint64_t val);
        Function *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serialiezr);
        bool isInRangeFunction(uint64_t val);
        Function *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serialiezr);

+        virtual void print();

        Set * getRange() {return range;}
        CMEMALLOC;
 };
        Set * getRange() {return range;}
        CMEMALLOC;
 };


@@ -39,6 +41,7 @@ public:
        FunctionTable (Table *table, UndefinedBehavior behavior);
        Function *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serialiezr);
        FunctionTable (Table *table, UndefinedBehavior behavior);
        Function *clone(CSolver *solver, CloneMap *map);
        virtual void serialize(Serializer* serialiezr);

+        virtual void print();

        Set * getRange();
        CMEMALLOC;
 };
        Set * getRange();
        CMEMALLOC;
 };