private:
typedef std::map<std::string, Variant> ItemMap;
typedef std::list<CollectionItemTypeBase *> TypeList;
- typedef std::list<CollectionSource *> SourceList;
+ typedef std::list<const CollectionSource *> SourceList;
TypeList types;
ItemMap items;
T &get(const std::string &name)
{
typedef typename RemoveConst<T>::Type NCT;
- return extract<NCT>(get_var(name, get_type<NCT>()));
+ return extract<NCT>(get_var(name, get_type<NCT>(name)));
}
private:
CollectionItemType<T> &add_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<typename T>
- 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;
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
/** 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<typename T>
Creator(FuncPtr f): func(f) { }
virtual T *create(Collection &coll, const std::string &name) const
- { return (static_cast<C &>(coll).*func)(name); }
+ { return (dynamic_cast<C &>(coll).*func)(name); }
};
template<typename B>
}
template<typename T>
-CollectionItemTypeBase *Collection::get_type() const
+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>())
- return *j;
- return 0;
+ {
+ if(!name.empty() && (*j)->match_name(name))
+ return *j;
+ type = *j;
+ }
+ return type;
}
} // namespace DataFile