X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fcollection.h;h=06b8e348cbe3d2a7e16ce2735971802efa73a863;hp=d5853f2ea6cb4a3fba658dd5912e148f419cb8e4;hb=43b8dee0bf05dee1b4a07cc001fae0c81ec53a2f;hpb=bcbe8b90de68e18260313b8f0e8a8dd9c7661903

diff --git a/source/collection.h b/source/collection.h
index d5853f2..06b8e34 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -17,17 +17,14 @@ namespace DataFile {
 Helper struct to determine whether a Loader has a Collection typedef.
 */
 template<typename T>
-struct NeedsCollection
+struct NeedsCollection: public Sfinae
 {
-	struct Yes { char c[2]; };
-	struct No { char c; };
-
 	template<typename U>
 	static Yes f(typename U::Collection *);
 	template<typename U>
 	static No f(...);
 
-	enum { value = (sizeof(f<T>(0))==sizeof(Yes)) };
+	enum { value = Evaluate<sizeof(f<T>(0))>::value };
 };
 
 class CollectionItemTypeBase;
@@ -45,6 +42,11 @@ method for details.
 
 Collections can have sources for loading objects on demand.  Automatic loading
 only works on a non-const Collection.  See class CollectionSource for details.
+
+As a last resort, a fallback collection can be designated for loading items
+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
 {
@@ -75,23 +77,23 @@ public:
 		}
 	};
 
-protected:
 	template<typename T, bool = NeedsCollection<typename T::Loader>::value>
 	class ItemLoader;
 
 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;
 	SourceList sources;
+	Collection *fallback;
 
 	Collection(const Collection &);
 	Collection &operator=(const Collection &);
 public:
-	Collection() { }
+	Collection();
 	virtual ~Collection();
 
 	/** Adds an object into the collection.  The name must not pre-exist.  The
@@ -119,7 +121,7 @@ public:
 	template<typename T>
 	T &get(const std::string &name) const
 	{
-		return extract<T>(get_item(items, name));
+		return extract<typename RemoveConst<T>::Type>(get_item(items, name));
 	}
 
 	/** Gets a typed object from the collection.  If the name is not found,
@@ -128,7 +130,8 @@ public:
 	template<typename T>
 	T &get(const std::string &name)
 	{
-		return extract<T>(get_var(name, get_type<T>()));
+		typedef typename RemoveConst<T>::Type NCT;
+		return extract<NCT>(get_var(name, get_type<NCT>()));
 	}
 
 private:
@@ -247,18 +250,42 @@ protected:
 	template<typename T>
 	CollectionItemType<T> &add_type();
 
+private:
 	/// Returns the descriptor for a type, or null if one isn't defined.
 	template<typename T>
 	CollectionItemTypeBase *get_type() 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;
 
-	void add_source(CollectionSource &);
+protected:
+	/** Adds a source for automatically loading items.  Sources are consulted
+	in the order they are added. */
+	void add_source(const CollectionSource &);
+
+public:
+	/** Opens a raw resource, without interpreting it as object data.  Null is
+	returned if no such file is found.  The caller must dispose of the returned
+	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;
 
 	void load_items_from_sources(const CollectionItemTypeBase &);
+
+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<typename T>
@@ -306,6 +333,7 @@ public:
 	const std::string &get_keyword() const { return kwd; }
 	void add_suffix(const std::string &);
 	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 void add_to_loader(Collection::Loader &) const = 0;
 	virtual bool can_create() const = 0;
@@ -357,7 +385,7 @@ private:
 		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>
@@ -420,6 +448,9 @@ public:
 		return *this;
 	}
 
+	virtual bool is_same_type(const CollectionItemTypeBase &other) const
+	{ return dynamic_cast<const CollectionItemType<T> *>(&other); }
+
 	virtual bool check_item_type(const Variant &var) const
 	{ return var.check_type<RefPtr<T> >(); }
 
@@ -452,14 +483,12 @@ public:
 template<typename T>
 T &Collection::extract(const Variant &var) const
 {
-	typedef RefPtr<typename RemoveConst<T>::Type> RPNCT;
-
-	if(!var.check_type<RPNCT>())
+	if(!var.check_type<RefPtr<T> >())
 		if(CollectionItemTypeBase *type = get_type_for_item(var))
 			if(T *item = type->extract<T>(var))
 				return *item;
 
-	return *var.value<RPNCT>();
+	return *var.value<RefPtr<T> >();
 }
 
 template<typename T>
@@ -474,7 +503,7 @@ template<typename T>
 CollectionItemTypeBase *Collection::get_type() const
 {
 	for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
-		if(dynamic_cast<CollectionItemType<typename RemoveConst<T>::Type> *>(*j))
+		if(dynamic_cast<CollectionItemType<T> *>(*j))
 			return *j;
 	for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
 		if((*j)->can_extract<T>())