Use metaprogramming constructs from std

[libs/datafile.git] / source / collection.h

diff --git a/source/collection.h b/source/collection.h
index d0e8a1a8bb9b25c636ab23a8c1e4bbdcfa5c04a7..473b58ed76329cf72d971f728d29ba0aae296760 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -1,8 +1,10 @@
 #ifndef MSP_DATAFILE_COLLECTION_H_
 #define MSP_DATAFILE_COLLECTION_H_
 
+#include <type_traits>
 #include <msp/core/attributes.h>
 #include <msp/core/maputils.h>
+#include <msp/core/noncopyable.h>
 #include <msp/core/refptr.h>
 #include "collectionsource.h"
 #include "loader.h"
@@ -49,7 +51,7 @@ that are not present.  Items retrieted from the fallback collection are shared
 between the collections, and are only deleted when all collections in the chain
 have been destroyed.
 */
-class Collection
+class Collection: private NonCopyable
 {
 public:
        /**
@@ -91,8 +93,6 @@ private:
        SourceList sources;
        Collection *fallback;
 
-       Collection(const Collection &);
-       Collection &operator=(const Collection &);
 public:
        Collection();
        virtual ~Collection();
@@ -105,10 +105,11 @@ public:
                if(!item)
                        throw std::invalid_argument("Collection::add(item)");
 
-               RefPtr<typename RemoveConst<T>::Type> ptr(item);
+               typedef typename std::remove_cv<T>::type NCT;
+               RefPtr<NCT> ptr(item);
                try
                {
-                       insert_unique(items, name, ptr);
+                       add_var(name, get_type<NCT>(name), ptr);
                }
                catch(...)
                {
@@ -122,7 +123,7 @@ public:
        template<typename T>
        T &get(const std::string &name) const
        {
-               return extract<typename RemoveConst<T>::Type>(get_item(items, name));
+               return extract<typename std::remove_cv<T>::type>(get_item(items, name));
        }
 
        /** Gets a typed object from the collection.  If the name is not found,
@@ -131,12 +132,32 @@ public:
        template<typename T>
        T &get(const std::string &name)
        {
-               typedef typename RemoveConst<T>::Type NCT;
+               typedef typename std::remove_cv<T>::type NCT;
                return extract<NCT>(get_var(name, get_type<NCT>(name)));
        }
 
+       /** Finds a typed object in the collection.  Returns null if the name does
+       not exist.  Throws if the name exists but the object is of an incorrect
+       type. */
+       template<typename T>
+       T *find(const std::string &name) const
+       {
+               ItemMap::const_iterator i = items.find(name);
+               return (i!=items.end() ? extract<typename std::remove_cv<T>::type>(i->second) : 0);
+       }
+
+       template<typename T>
+       T *find(const std::string &name)
+       {
+               typedef typename std::remove_cv<T>::type NCT;
+               const Variant *var = find_var(name, get_type<NCT>(name));
+               return (var ? &extract<NCT>(*var) : 0);
+       }
+
 private:
+       void add_var(const std::string &, const CollectionItemTypeBase *, const Variant &);
        const Variant &get_var(const std::string &, const CollectionItemTypeBase *);
+       const Variant *find_var(const std::string &, const CollectionItemTypeBase *);
 
        template<typename T>
        T &extract(const Variant &var) const;
@@ -167,7 +188,7 @@ public:
        std::list<std::string> get_names() const
        {
                std::list<std::string> names;
-               gather_items<typename RemoveConst<T>::Type>(0, &names, 0, false);
+               gather_items<typename std::remove_cv<T>::type>(0, &names, 0, false);
                return names;
        }
 
@@ -177,7 +198,7 @@ public:
        std::list<std::string> get_names()
        {
                std::list<std::string> names;
-               gather_items<typename RemoveConst<T>::Type>(0, &names, 0, true);
+               gather_items<typename std::remove_cv<T>::type>(0, &names, 0, true);
                return names;
        }
 
@@ -186,7 +207,7 @@ public:
        std::list<T *> get_list() const
        {
                std::vector<const Variant *> vars;
-               gather_items<typename RemoveConst<T>::Type>(&vars, 0, 0, false);
+               gather_items<typename std::remove_cv<T>::type>(&vars, 0, 0, false);
                return extract_list<T>(vars);
        }
 
@@ -195,12 +216,12 @@ public:
        template<typename T>
        std::list<T *> get_list()
        {
-               CollectionItemTypeBase *type = get_type<typename RemoveConst<T>::Type>();
+               CollectionItemTypeBase *type = get_type<typename std::remove_cv<T>::type>();
                if(type)
                        load_items_from_sources(*type);
 
                std::vector<const Variant *> vars;
-               gather_items<typename RemoveConst<T>::Type>(&vars, 0, type, true);
+               gather_items<typename std::remove_cv<T>::type>(&vars, 0, type, true);
                return extract_list<T>(vars);
        }
 
@@ -222,19 +243,19 @@ public:
        /// Checks whether a typed object exists in the collection.
        template<typename T>
        bool contains(const std::string &name) const
-       { return get_status<typename RemoveConst<T>::Type>(name)==1; }
+       { return get_status<typename std::remove_cv<T>::type>(name)==1; }
 
        /** Checks whether a typed object exists in the collection or is loadable
        from a source. */
        template<typename T>
        bool contains(const std::string &name)
-       { return get_status<typename RemoveConst<T>::Type>(name)>0; }
+       { return get_status<typename std::remove_cv<T>::type>(name)>0; }
 
        /// Returns the name of an item in the collection.
        template<typename T>
        const std::string &get_name(T *d) const
        {
-               typedef RefPtr<typename RemoveConst<T>::Type> RPNCT;
+               typedef RefPtr<typename std::remove_cv<T>::type> RPNCT;
 
                for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
                        if(i->second.check_type<RPNCT>())
@@ -279,10 +300,6 @@ public:
        object when done with it. */
        IO::Seekable *open_raw(const std::string &) const;
 
-protected:
-       // Deprecated.  Use open_raw instead.
-       DEPRECATED IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
-
 private:
        void gather_names_from_sources(std::list<std::string> &, const CollectionItemTypeBase &) const;
 
@@ -349,6 +366,7 @@ public:
        virtual bool can_create() const = 0;
        virtual void create_item(Collection &, const std::string &) const = 0;
        virtual void load_item(Collection &, Parser &, const std::string &) const = 0;
+       virtual void notify_item(Collection &, const std::string &, const Variant &) const = 0;
 
        template<typename T>
        bool can_extract() const
@@ -398,6 +416,26 @@ private:
                { return (dynamic_cast<C &>(coll).*func)(name); }
        };
 
+       struct NotifyeeBase
+       {
+               virtual ~NotifyeeBase() { }
+
+               virtual void notify(Collection &, const std::string &, T &) const = 0;
+       };
+
+       template<typename C>
+       struct Notifyee: NotifyeeBase
+       {
+               typedef void (C::*FuncPtr)(const std::string &, T &);
+
+               FuncPtr func;
+
+               Notifyee(FuncPtr f): func(f) { }
+
+               virtual void notify(Collection &coll, const std::string &name, T &item) const
+               { (dynamic_cast<C &>(coll).*func)(name, item); }
+       };
+
        template<typename B>
        struct Extractor: CollectionItemTypeBase::Extractor<B>
        {
@@ -406,6 +444,7 @@ private:
        };
 
        CreatorBase *creat;
+       std::vector<NotifyeeBase *> notif;
 
 public:
        CollectionItemType():
@@ -415,6 +454,8 @@ public:
        ~CollectionItemType()
        {
                delete creat;
+               for(typename std::vector<NotifyeeBase *>::const_iterator i=notif.begin(); i!=notif.end(); ++i)
+                       delete *i;
        }
 
        /** Sets a datafile keyword for this item type.  The Collection's loader
@@ -458,6 +499,13 @@ public:
                return *this;
        }
 
+       template<typename C>
+       CollectionItemType &notify(void (C::*func)(const std::string &, T &))
+       {
+               notif.push_back(new Notifyee<C>(func));
+               return *this;
+       }
+
        virtual bool is_same_type(const CollectionItemTypeBase &other) const
        { return dynamic_cast<const CollectionItemType<T> *>(&other); }
 
@@ -483,6 +531,13 @@ public:
        {
                throw std::runtime_error("this type cannot be loaded");
        }
+
+       virtual void notify_item(Collection &coll, const std::string &name, const Variant &var) const
+       {
+               RefPtr<T> obj = var.value<RefPtr<T> >();
+               for(typename std::vector<NotifyeeBase *>::const_iterator i=notif.begin(); i!=notif.end(); ++i)
+                       (*i)->notify(coll, name, *obj);
+       }
 };