Add equality comparison for Variant

[libs/core.git] / source / core / variant.h

diff --git a/source/core/variant.h b/source/core/variant.h
index e00885c94210ef720c3d48c42769d99a7d3182f8..2dd9732fc60dd4faf1a692eef1be63d9c83328cd 100644 (file)
--- a/source/core/variant.h
+++ b/source/core/variant.h
@@ -24,6 +24,8 @@ private:
 
                virtual const std::type_info &type_id() const = 0;
                virtual StoreBase *clone() const = 0;
+               virtual bool type_equals(const StoreBase &) const = 0;
+               virtual bool value_equals(const StoreBase &) const = 0;
        };
 
        template<typename T>
@@ -31,10 +33,20 @@ private:
        {
                T data;
 
-               Store(T d): data(d) { }
+               Store(const T &d): data(d) { }
 
                virtual const std::type_info &type_id() const { return typeid(T); }
                virtual StoreBase *clone() const { return new Store<T>(data); }
+               virtual bool type_equals(const StoreBase &s) const { return dynamic_cast<const Store<T> *>(&s); }
+               virtual bool value_equals(const StoreBase &s) const { return value_equals_<T>(s); }
+
+               template<typename U>
+               typename EnableIf<IsEqualityComparable<U>::value, bool>::Yes value_equals_(const StoreBase &s) const
+               { const Store<T> *t = dynamic_cast<const Store<T> *>(&s); return (t && t->data==data); }
+
+               template<typename U>
+               typename EnableIf<IsEqualityComparable<U>::value, bool>::No value_equals_(const StoreBase &) const
+               { return false; }
        };
 
        StoreBase *store;
@@ -61,14 +73,28 @@ public:
                return *this;
        }
 
+private:
        template<typename T>
-       T &value() const
+       Store<typename RemoveConst<T>::Type> *get_typed_store() const
        {
                typedef typename RemoveConst<T>::Type NCT;
                Store<NCT> *s = dynamic_cast<Store<NCT> *>(store);
                if(!s)
                        throw type_mismatch(typeid(T), (store ? store->type_id() : typeid(void)));
-               return s->data;
+               return s;
+       }
+
+public:
+       template<typename T>
+       T &value()
+       {
+               return get_typed_store<T>()->data;
+       }
+
+       template<typename T>
+       const T &value() const
+       {
+               return get_typed_store<T>()->data;
        }
 
        template<typename T>
@@ -77,6 +103,15 @@ public:
                return dynamic_cast<Store<typename RemoveConst<T>::Type> *>(store)!=0;
        }
 
+       bool check_same_type(const Variant &v) const
+       { return store && v.store && store->type_equals(*v.store); }
+
+       bool operator==(const Variant &v) const
+       { return store && v.store && store->value_equals(*v.store); }
+
+       bool operator!=(const Variant &v) const
+       { return !(operator==(v)); }
+
        template<typename T>
        operator T() const
        { return value<T>(); }