After resolving conflicts

[satune.git] / src / AST / set.h

diff --git a/src/AST/set.h b/src/AST/set.h
index 6dbeac063f999b3e611cc3816f36b15eb87d5050..c647af536773c4434975455dd8ea0d3828508c95 100644 (file)
--- a/src/AST/set.h
+++ b/src/AST/set.h
@@ -24,8 +24,11 @@ public:
        uint64_t getNewUniqueItem() {return low++;}
        uint64_t getMemberAt(uint index);
        uint64_t getElement(uint index);
+       uint getUnionSize(Set *s);
+       virtual bool isMutableSet() {return false;}
        virtual Set *clone(CSolver *solver, CloneMap *map);
-       virtual void serialize(Serializer* serializer);
+       virtual void serialize(Serializer *serializer);
+       virtual void print();
        CMEMALLOC;
 protected:
        VarType type;
@@ -33,8 +36,8 @@ protected:
        uint64_t low;//also used to count unique items
        uint64_t high;
        Vector<uint64_t> *members;
-
 };
 
+int intcompare(const void *p1, const void *p2);
 #endif/* SET_H */