X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fvariant.h;h=5109dbcc11811ac8297f71e3903a1eb8c4f36f36;hp=f2d2ee563f339bb8b64eb020b516c3792b1db08f;hb=641a71730a0135fe647f6a230e9704d8b677f2c5;hpb=ab956fd92f2110197c8e035b12dafa30a18b8ae1

diff --git a/source/core/variant.h b/source/core/variant.h
index f2d2ee5..5109dbc 100644
--- a/source/core/variant.h
+++ b/source/core/variant.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2008 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_CORE_VARIANT_H_
 #define MSP_CORE_VARIANT_H_
 
 #include <stdexcept>
+#include <type_traits>
 #include <typeinfo>
 #include "meta.h"
 
@@ -31,6 +25,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>
@@ -38,10 +34,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 std::enable_if<IsEqualityComparable<U>::value, bool>::type 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 std::enable_if<!IsEqualityComparable<U>::value, bool>::type value_equals_(const StoreBase &) const
+		{ return false; }
 	};
 
 	StoreBase *store;
@@ -49,7 +55,7 @@ private:
 public:
 	Variant(): store(0) { }
 	template<typename T>
-	Variant(const T &v): store(new Store<typename RemoveConst<T>::Type>(v)) { }
+	Variant(const T &v): store(new Store<typename std::remove_cv<T>::type>(v)) { }
 	Variant(const Variant &v): store(v.store ? v.store->clone() : 0) { }
 	~Variant() { delete store; }
 
@@ -57,7 +63,7 @@ public:
 	Variant &operator=(const T &v)
 	{
 		delete store;
-		store = new Store<typename RemoveConst<T>::Type>(v);
+		store = new Store<typename std::remove_cv<T>::type>(v);
 		return *this;
 	}
 
@@ -68,22 +74,45 @@ public:
 		return *this;
 	}
 
+private:
 	template<typename T>
-	T &value() const
+	Store<typename std::remove_cv<T>::type> *get_typed_store() const
 	{
-		typedef typename RemoveConst<T>::Type NCT;
+		typedef typename std::remove_cv<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>
 	bool check_type() const
 	{
-		return dynamic_cast<Store<typename RemoveConst<T>::Type> *>(store)!=0;
+		return dynamic_cast<Store<typename std::remove_cv<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>(); }