X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=5dac2e6b46fd8d35b38f35fafcc3f8cdb3549387;hb=0881c95bef812d94d8086225c2736b4f15b4c8dc;hp=207ecff8dff8d7f068aa033994ef2a5e608ba56a;hpb=6a033cf0f5164915168f9cb778e801ed86450e1c;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 207ecff..5dac2e6 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -35,16 +35,18 @@ See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 */
 class Loader
 {
-private:
+protected:
 	typedef std::map<StatementKey, LoaderAction *> ActionMap;
 
-	ActionMap actions;
+private:
+	ActionMap local_actions;
+	ActionMap *actions;
 	Parser *cur_parser;
 	unsigned cur_level;
 	const Statement *cur_st;
 	bool sub_loaded;
 	bool direct;
-	std::list<Loader *> aux_loaders;
+	std::vector<Loader *> aux_loaders;
 protected:
 	bool check_sub_loads;
 
@@ -88,6 +90,11 @@ protected:
 	/** Processes the current statement's substatements with another Loader. */
 	void load_sub_with(Loader &);
 
+	/** Sets the actions to be used when loading.  If the map is empty,
+	init_actions will be called. */
+	void set_actions(ActionMap &);
+	virtual void init_actions() { }
+
 	/** Adds a keyword that is loaded by calling a function. */
 	template<typename L>
 	void add(const std::string &k, void (L::*func)())
@@ -97,6 +104,12 @@ protected:
 	void add(const std::string &k, void (L::*func)(A0))
 	{ add(k, new LoaderFunc1<L, A0>(func)); }
 
+#if __cplusplus>=201103L
+	template<typename L, typename... Args>
+	void add(const std::string &k, void (L::*func)(Args...))
+	{ add(k, new LoaderFuncN<L, Args...>(func)); }
+
+#else
 	template<typename L, typename A0, typename A1>
 	void add(const std::string &k, void (L::*func)(A0, A1))
 	{ add(k, new LoaderFunc2<L, A0, A1>(func)); }
@@ -112,6 +125,15 @@ protected:
 	template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
 	void add(const std::string &k, void (L::*func)(A0, A1, A2, A3, A4))
 	{ add(k, new LoaderFunc5<L, A0, A1, A2, A3, A4>(func)); }
+#endif
+
+#if __cplusplus>=201103L
+	/** Adds a keyword that is loaded by calling a function with a bound
+	first argument. */
+	template<typename L, typename B0, typename... Args>
+	void add(const std::string &k, void (L::*func)(B0, Args...), const typename RemoveReference<B0>::Type &b0)
+	{ add(k, new LoaderFuncNBound1<L, B0, Args...>(func, b0)); }
+#endif
 
 	/** Adds a keyword that is loaded into a member of the loaded object. */
 	template<typename L, typename T0>
@@ -174,6 +196,8 @@ template<typename T, typename... Args>
 void load(T &obj, typename T::Loader::Collection &coll, const std::string &fn, Args &... args)
 {
 	RefPtr<IO::Seekable> in = coll.open_raw(fn);
+	if(!in)
+		throw IO::file_not_found(fn);
 
 	Parser parser(*in, fn);
 	typename T::Loader loader(obj, coll, args...);
@@ -188,6 +212,8 @@ template<typename T, typename C, typename... Args>
 typename EnableIf<NeedsCollection<typename T::Loader>::value, void>::No load(T &obj, C &coll, const std::string &fn, Args &... args)
 {
 	RefPtr<IO::Seekable> in = coll.open_raw(fn);
+	if(!in)
+		throw IO::file_not_found(fn);
 
 	Parser parser(*in, fn);
 	typename T::Loader loader(obj, args...);