#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"
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.
between the collections, and are only deleted when all collections in the chain
have been destroyed.
*/
-class Collection
+class Collection: private NonCopyable
{
public:
/**
*/
class Loader: public DataFile::Loader
{
- template<typename T> friend class CollectionItemType;
+ template<typename T> friend class LoadableCollectionItemType;
private:
Collection &coll;
private:
typedef std::map<std::string, Variant> ItemMap;
- typedef std::list<CollectionItemTypeBase *> TypeList;
- typedef std::list<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
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(...)
{
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,
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;
template<typename T>
- std::list<T *> extract_list(const std::list<const Variant *> &vars) const
+ std::list<T *> extract_list(const std::vector<const Variant *> &vars) const
{
std::list<T *> result;
- for(std::list<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;
}
- void gather_items(std::list<const Variant *> *, std::list<std::string> *, const CollectionItemTypeBase &, bool) const;
+ void gather_items(std::vector<const Variant *> *, std::list<std::string> *, const CollectionItemTypeBase &, bool) const;
template<typename T>
- void gather_items(std::list<const Variant *> *vars, std::list<std::string> *names, const CollectionItemTypeBase *type, bool include_sources) const
+ void gather_items(std::vector<const Variant *> *vars, std::list<std::string> *names, const CollectionItemTypeBase *type, bool include_sources) const
{
if(type || (type = get_type<T>()))
gather_items(vars, names, *type, include_sources);
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;
}
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;
}
template<typename T>
std::list<T *> get_list() const
{
- std::list<const Variant *> vars;
- gather_items<typename RemoveConst<T>::Type>(&vars, 0, 0, false);
+ std::vector<const Variant *> vars;
+ gather_items<typename std::remove_cv<T>::type>(&vars, 0, 0, false);
return extract_list<T>(vars);
}
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::list<const Variant *> vars;
- gather_items<typename RemoveConst<T>::Type>(&vars, 0, type, true);
+ std::vector<const Variant *> vars;
+ gather_items<typename std::remove_cv<T>::type>(&vars, 0, type, true);
return extract_list<T>(vars);
}
/// 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");
/** 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>
+ typename CollectionItemTypeChooser<T>::Type &modify_type();
private:
/** Returns the descriptor for a type, or null if one isn't defined. An
object when done with it. */
IO::Seekable *open_raw(const std::string &) const;
-protected:
- 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;
protected:
struct ExtractorBase
{
- virtual ~ExtractorBase() { }
+ virtual ~ExtractorBase() = default;
};
template<typename T>
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;
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;
}
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;
}
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. */
return *this;
}
- /** Adds a suffix that is used to match names when looking for future
+ /** Adds a suffix that is used to match names when looking for loadable
objects. There is no implied separator; a name matches if it ends with the
suffix. If a keyword is defined before any suffixes, then "."+keyword is
added as a suffix. */
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;
}
return *this;
}
- virtual bool is_same_type(const CollectionItemTypeBase &other) const
+ template<typename F>
+ CollectionItemType ¬ify(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);
}
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>
+typename CollectionItemTypeChooser<T>::Type &Collection::modify_type()
+{
+ for(CollectionItemTypeBase *t: types)
+ if(CollectionItemType<T> *tt = dynamic_cast<CollectionItemType<T> *>(t))
+ return *tt;
+
+ throw std::logic_error("type not found in collection");
+}
+
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;
}
projects / libs / datafile.git / blobdiff