X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=d0e8a1a8bb9b25c636ab23a8c1e4bbdcfa5c04a7;hb=HEAD;hp=5521975402d0526773a44bf6210c9577b87d0f79;hpb=a887b3f7518605c22e4b70eeb9fe136acb2ea632;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index 5521975..c8470dd 100644
--- 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"
@@ -19,6 +21,20 @@ class CollectionItemTypeBase;
 template<typename T>
 class CollectionItemType;
 
+template<typename T>
+class LoadableCollectionItemType;
+
+template<typename T, bool = HasLoader<T>::value>
+struct CollectionItemTypeChooser;
+
+template<typename T>
+struct CollectionItemTypeChooser<T, true>
+{ typedef LoadableCollectionItemType<T> Type; };
+
+template<typename T>
+struct CollectionItemTypeChooser<T, false>
+{ typedef CollectionItemType<T> Type; };
+
 /**
 A collection of objects that can be loaded from a datafile.  Each object is
 identified by a name, which must be unique across the entire collection.
@@ -35,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:
 	/**
@@ -44,7 +60,7 @@ public:
 	*/
 	class Loader: public DataFile::Loader
 	{
-		template<typename T> friend class CollectionItemType;
+		template<typename T> friend class LoadableCollectionItemType;
 
 	private:
 		Collection &coll;
@@ -69,18 +85,13 @@ public:
 
 private:
 	typedef std::map<std::string, Variant> ItemMap;
-	typedef std::vector<CollectionItemTypeBase *> TypeList;
-	typedef std::vector<const CollectionSource *> SourceList;
 
-	TypeList types;
+	std::vector<CollectionItemTypeBase *> types;
 	ItemMap items;
-	SourceList sources;
-	Collection *fallback;
+	std::vector<const CollectionSource *> sources;
+	Collection *fallback = nullptr;
 
-	Collection(const Collection &);
-	Collection &operator=(const Collection &);
 public:
-	Collection();
 	virtual ~Collection();
 
 	/** Adds an object into the collection.  The name must not pre-exist.  The
@@ -91,10 +102,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(...)
 		{
@@ -108,7 +120,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,
@@ -117,12 +129,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;
@@ -131,8 +163,8 @@ private:
 	std::list<T *> extract_list(const std::vector<const Variant *> &vars) const
 	{
 		std::list<T *> result;
-		for(std::vector<const Variant *>::const_iterator i=vars.begin(); i!=vars.end(); ++i)
-			result.push_back(&extract<T>(**i));
+		for(const Variant *v: vars)
+			result.push_back(&extract<T>(*v));
 		return result;
 	}
 
@@ -153,7 +185,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;
 	}
 
@@ -163,7 +195,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;
 	}
 
@@ -172,7 +204,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);
 	}
 
@@ -181,12 +213,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);
 	}
 
@@ -208,24 +240,24 @@ 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>())
-				if(i->second.value<RPNCT>().get()==d)
-					return i->first;
+		for(const auto &kvp: items)
+			if(kvp.second.check_type<RPNCT>())
+				if(kvp.second.value<RPNCT>().get()==d)
+					return kvp.first;
 	
 		// XXX Need better exception class
 		throw std::runtime_error("Item not found in collection");
@@ -235,12 +267,12 @@ protected:
 	/** Adds a type to the collection.  The returned descriptor object reference
 	can be used to define how objects of that type can be loaded. */
 	template<typename T>
-	CollectionItemType<T> &add_type();
+	typename CollectionItemTypeChooser<T>::Type &add_type();
 
 	/** Returns a mutable reference to an existing type descriptor.  This can be
 	used to e.g. override the creator function of a type added by a base class. */
 	template<typename T>
-	CollectionItemType<T> &modify_type();
+	typename CollectionItemTypeChooser<T>::Type &modify_type();
 
 private:
 	/** Returns the descriptor for a type, or null if one isn't defined.  An
@@ -265,10 +297,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;
 
@@ -306,7 +334,7 @@ class CollectionItemTypeBase
 protected:
 	struct ExtractorBase
 	{
-		virtual ~ExtractorBase() { }
+		virtual ~ExtractorBase() = default;
 	};
 
 	template<typename T>
@@ -319,13 +347,15 @@ protected:
 	std::vector<std::string> suffixes;
 	std::vector<ExtractorBase *> extractors;
 
-	CollectionItemTypeBase() { }
+	CollectionItemTypeBase() = default;
 public:
 	virtual ~CollectionItemTypeBase();
 
+protected:
 	void set_keyword(const std::string &);
-	const std::string &get_keyword() const { return kwd; }
 	void add_suffix(const std::string &);
+public:
+	const std::string &get_keyword() const { return kwd; }
 	bool match_name(const std::string &) const;
 	virtual bool is_same_type(const CollectionItemTypeBase &) const = 0;
 	virtual bool check_item_type(const Variant &) const = 0;
@@ -333,12 +363,13 @@ 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(const std::string &, const Variant &) const = 0;
 
 	template<typename T>
 	bool can_extract() const
 	{
-		for(std::vector<ExtractorBase *>::const_iterator i=extractors.begin(); i!=extractors.end(); ++i)
-			if(dynamic_cast<Extractor<T> *>(*i))
+		for(ExtractorBase *e: extractors)
+			if(dynamic_cast<Extractor<T> *>(e))
 				return true;
 		return false;
 	}
@@ -346,8 +377,8 @@ public:
 	template<typename T>
 	T *extract(const Variant &var) const
 	{
-		for(std::vector<ExtractorBase *>::const_iterator i=extractors.begin(); i!=extractors.end(); ++i)
-			if(Extractor<T> *ex = dynamic_cast<Extractor<T> *>(*i))
+		for(ExtractorBase *e: extractors)
+			if(Extractor<T> *ex = dynamic_cast<Extractor<T> *>(e))
 				return &ex->extract(var);
 		return 0;
 	}
@@ -362,45 +393,17 @@ template<typename T>
 class CollectionItemType: public CollectionItemTypeBase
 {
 private:
-	struct CreatorBase
-	{
-		virtual ~CreatorBase() { }
-
-		virtual T *create(Collection &, const std::string &) const = 0;
-	};
-
-	template<typename C>
-	struct Creator: CreatorBase
-	{
-		typedef T *(C::*FuncPtr)(const std::string &);
-
-		FuncPtr func;
-
-		Creator(FuncPtr f): func(f) { }
-
-		virtual T *create(Collection &coll, const std::string &name) const
-		{ return (dynamic_cast<C &>(coll).*func)(name); }
-	};
-
 	template<typename B>
 	struct Extractor: CollectionItemTypeBase::Extractor<B>
 	{
-		virtual B &extract(const Variant &var) const
+		B &extract(const Variant &var) const override
 		{ return *var.value<RefPtr<T> >(); }
 	};
 
-	CreatorBase *creat;
+	std::function<T *(const std::string &)> create_func;
+	std::vector<std::function<void(const std::string &, T &)>> notify_funcs;
 
 public:
-	CollectionItemType():
-		creat(0)
-	{ }
-
-	~CollectionItemType()
-	{
-		delete creat;
-	}
-
 	/** Sets a datafile keyword for this item type.  The Collection's loader
 	will accept a statement with this keyword and a single string argument - the
 	item's name. */
@@ -426,11 +429,10 @@ public:
 	type.  It must return the created object, or null if it could not be
 	created.  It's also permissible to load the item via other means and then
 	return null. */
-	template<typename C>
-	CollectionItemType &creator(T *(C::*func)(const std::string &))
+	template<typename F>
+	CollectionItemType &creator(F func)
 	{
-		delete creat;
-		creat = new Creator<C>(func);
+		create_func = func;
 		return *this;
 	}
 
@@ -442,28 +444,56 @@ public:
 		return *this;
 	}
 
-	virtual bool is_same_type(const CollectionItemTypeBase &other) const
+	template<typename F>
+	CollectionItemType &notify(F func)
+	{
+		notify_funcs.emplace_back(func);
+		return *this;
+	}
+
+	bool is_same_type(const CollectionItemTypeBase &other) const override
 	{ return dynamic_cast<const CollectionItemType<T> *>(&other); }
 
-	virtual bool check_item_type(const Variant &var) const
+	bool check_item_type(const Variant &var) const override
 	{ return var.check_type<RefPtr<T> >(); }
 
-	virtual void add_to_loader(Collection::Loader &loader) const
-	{ loader.add(kwd, &Collection::Loader::item<T, T>); }
+	void add_to_loader(Collection::Loader &) const override
+	{ }
 
-	virtual bool can_create() const
-	{ return creat!=0; }
+	bool can_create() const override
+	{ return static_cast<bool>(create_func); }
 
-	virtual void create_item(Collection &coll, const std::string &name) const
+	void create_item(Collection &coll, const std::string &name) const override
 	{
-		if(!creat)
+		if(!create_func)
 			throw std::runtime_error("no creator");
-		T *obj = creat->create(coll, name);
+		T *obj = create_func(name);
 		if(obj)
 			coll.add(name, obj);
 	}
 
-	virtual void load_item(Collection &coll, Parser &parser, const std::string &name) const
+	void load_item(Collection &, Parser &, const std::string &) const override
+	{
+		throw std::runtime_error("this type cannot be loaded");
+	}
+
+	void notify_item(const std::string &name, const Variant &var) const override
+	{
+		RefPtr<T> obj = var.value<RefPtr<T> >();
+		for(const auto &n: notify_funcs)
+			n(name, *obj);
+	}
+};
+
+
+template<typename T>
+class LoadableCollectionItemType: public CollectionItemType<T>
+{
+public:
+	void add_to_loader(Collection::Loader &loader) const override
+	{ loader.add(this->kwd, &Collection::Loader::item<T, T>); }
+
+	void load_item(Collection &coll, Parser &parser, const std::string &name) const override
 	{
 		RefPtr<T> obj = new T;
 		Collection::ItemLoader<T> ldr(*obj, coll);
@@ -486,19 +516,19 @@ T &Collection::extract(const Variant &var) const
 }
 
 template<typename T>
-CollectionItemType<T> &Collection::add_type()
+typename CollectionItemTypeChooser<T>::Type &Collection::add_type()
 {
-	CollectionItemType<T> *type = new CollectionItemType<T>;
+	typename CollectionItemTypeChooser<T>::Type *type = new typename CollectionItemTypeChooser<T>::Type;
 	types.push_back(type);
 	return *type;
 }
 
 template<typename T>
-CollectionItemType<T> &Collection::modify_type()
+typename CollectionItemTypeChooser<T>::Type &Collection::modify_type()
 {
-	for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
-		if(CollectionItemType<T> *t = dynamic_cast<CollectionItemType<T> *>(*j))
-			return *t;
+	for(CollectionItemTypeBase *t: types)
+		if(CollectionItemType<T> *tt = dynamic_cast<CollectionItemType<T> *>(t))
+			return *tt;
 
 	throw std::logic_error("type not found in collection");
 }
@@ -506,16 +536,16 @@ CollectionItemType<T> &Collection::modify_type()
 template<typename T>
 CollectionItemTypeBase *Collection::get_type(const std::string &name) const
 {
-	for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
-		if(dynamic_cast<CollectionItemType<T> *>(*j))
-			return *j;
-	CollectionItemTypeBase *type = 0;
-	for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
-		if((*j)->can_extract<T>())
+	for(CollectionItemTypeBase *t: types)
+		if(dynamic_cast<CollectionItemType<T> *>(t))
+			return t;
+	CollectionItemTypeBase *type = nullptr;
+	for(CollectionItemTypeBase *t: types)
+		if(t->can_extract<T>())
 		{
-			if(!name.empty() && (*j)->match_name(name))
-				return *j;
-			type = *j;
+			if(!name.empty() && t->match_name(name))
+				return t;
+			type = t;
 		}
 	return type;
 }