X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=5521975402d0526773a44bf6210c9577b87d0f79;hb=a887b3f7518605c22e4b70eeb9fe136acb2ea632;hp=174c7fcabce52812083a7d8184670d2b24eda32e;hpb=acf0e00b9e45615c5f10777d764100c2c086acab;p=libs%2Fdatafile.git diff --git a/source/collection.h b/source/collection.h index 174c7fc..5521975 100644 --- a/source/collection.h +++ b/source/collection.h @@ -1,11 +1,12 @@ #ifndef MSP_DATAFILE_COLLECTION_H_ #define MSP_DATAFILE_COLLECTION_H_ +#include #include -#include #include #include "collectionsource.h" #include "loader.h" +#include "meta.h" /* XXX This file is a big mess with too many things in it. However, the dependencies between those things make it difficult to split up. */ @@ -13,20 +14,6 @@ dependencies between those things make it difficult to split up. */ namespace Msp { namespace DataFile { -/** -Helper struct to determine whether a Loader has a Collection typedef. -*/ -template -struct NeedsCollection: public Sfinae -{ - template - static Yes f(typename U::Collection *); - template - static No f(...); - - enum { value = Evaluate(0))>::value }; -}; - class CollectionItemTypeBase; template @@ -82,8 +69,8 @@ public: private: typedef std::map ItemMap; - typedef std::list TypeList; - typedef std::list SourceList; + typedef std::vector TypeList; + typedef std::vector SourceList; TypeList types; ItemMap items; @@ -131,7 +118,7 @@ public: T &get(const std::string &name) { typedef typename RemoveConst::Type NCT; - return extract(get_var(name, get_type())); + return extract(get_var(name, get_type(name))); } private: @@ -141,18 +128,18 @@ private: T &extract(const Variant &var) const; template - std::list extract_list(const std::list &vars) const + std::list extract_list(const std::vector &vars) const { std::list result; - for(std::list::const_iterator i=vars.begin(); i!=vars.end(); ++i) + for(std::vector::const_iterator i=vars.begin(); i!=vars.end(); ++i) result.push_back(&extract(**i)); return result; } - void gather_items(std::list *, std::list *, const CollectionItemTypeBase &, bool) const; + void gather_items(std::vector *, std::list *, const CollectionItemTypeBase &, bool) const; template - void gather_items(std::list *vars, std::list *names, const CollectionItemTypeBase *type, bool include_sources) const + void gather_items(std::vector *vars, std::list *names, const CollectionItemTypeBase *type, bool include_sources) const { if(type || (type = get_type())) gather_items(vars, names, *type, include_sources); @@ -184,7 +171,7 @@ public: template std::list get_list() const { - std::list vars; + std::vector vars; gather_items::Type>(&vars, 0, 0, false); return extract_list(vars); } @@ -198,7 +185,7 @@ public: if(type) load_items_from_sources(*type); - std::list vars; + std::vector vars; gather_items::Type>(&vars, 0, type, true); return extract_list(vars); } @@ -250,10 +237,19 @@ protected: template CollectionItemType &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 + CollectionItemType &modify_type(); + private: - /// Returns the descriptor for a type, or null if one isn't defined. + /** Returns the descriptor for a type, or null if one isn't defined. An + optional name can be given to prioritize matching types. */ template - CollectionItemTypeBase *get_type() const; + CollectionItemTypeBase *get_type(const std::string & = std::string()) const; + + /// Gets a descriptor with the same type as another descriptor. + CollectionItemTypeBase *get_type(const CollectionItemTypeBase &) const; /// Returns the descriptor for an item, or null if it's of an unknown type. CollectionItemTypeBase *get_type_for_item(const Variant &) const; @@ -261,7 +257,7 @@ private: protected: /** Adds a source for automatically loading items. Sources are consulted in the order they are added. */ - void add_source(CollectionSource &); + void add_source(const CollectionSource &); public: /** Opens a raw resource, without interpreting it as object data. Null is @@ -270,7 +266,8 @@ public: IO::Seekable *open_raw(const std::string &) const; protected: - IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); } + // 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 &, const CollectionItemTypeBase &) const; @@ -281,6 +278,8 @@ protected: /** Sets a fallback collection, which will be consulted if an item is not found. */ void set_fallback(Collection *); + + Collection *get_fallback() const { return fallback; } }; template @@ -411,7 +410,7 @@ public: 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. */ @@ -495,15 +494,30 @@ CollectionItemType &Collection::add_type() } template -CollectionItemTypeBase *Collection::get_type() const +CollectionItemType &Collection::modify_type() +{ + for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j) + if(CollectionItemType *t = dynamic_cast *>(*j)) + return *t; + + throw std::logic_error("type not found in collection"); +} + +template +CollectionItemTypeBase *Collection::get_type(const std::string &name) const { for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j) if(dynamic_cast *>(*j)) return *j; + CollectionItemTypeBase *type = 0; for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j) if((*j)->can_extract()) - return *j; - return 0; + { + if(!name.empty() && (*j)->match_name(name)) + return *j; + type = *j; + } + return type; } } // namespace DataFile