X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floaderaction.h;h=a3b04437d279e3e6835bd20538d2c99311721064;hb=HEAD;hp=22fb82ad13691209b484383fa421c48fd188b024;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/loaderaction.h b/source/loaderaction.h
index 22fb82a..9e08dac 100644
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -1,12 +1,21 @@
 #ifndef MSP_DATAFILE_LOADERACTION_H_
 #define MSP_DATAFILE_LOADERACTION_H_
 
-#include "except.h"
+#include <msp/core/meta.h>
+#include "argumentstore.h"
 #include "statement.h"
 
 namespace Msp {
 namespace DataFile {
 
+template<typename T>
+std::string create_signature(const std::string &prefix = std::string())
+{ return prefix+std::string(1, TypeInfo<T>::signature); }
+
+template<typename T0, typename T1, typename... Tail>
+std::string create_signature(const std::string &prefix = std::string())
+{ return create_signature<T1, Tail...>(prefix+std::string(1, TypeInfo<T0>::signature)); }
+
 class Loader;
 
 /**
@@ -15,13 +24,15 @@ Base class for loader actions.
 class LoaderAction
 {
 protected:
-	LoaderAction() { }
+	LoaderAction() = default;
 public:
-	virtual ~LoaderAction() { }
+	virtual ~LoaderAction() = default;
 
 	/** Called to process a statement. */
 	virtual void execute(Loader &, const Statement &) const = 0;
 
+	virtual void execute(Loader &, const ArgumentStore &) const = 0;
+
 	virtual std::string get_signature() const = 0;
 };
 
@@ -40,12 +51,17 @@ private:
 public:
 	LoaderFunc0(FuncType f): func(f) { }
 
-	virtual void execute(Loader &l, const Statement &) const
+	void execute(Loader &l, const Statement &) const override
+	{
+		(dynamic_cast<L &>(l).*func)();
+	};
+
+	void execute(Loader &l, const ArgumentStore &) const override
 	{
 		(dynamic_cast<L &>(l).*func)();
 	};
 
-	virtual std::string get_signature() const
+	std::string get_signature() const override
 	{ return std::string(); }
 };
 
@@ -64,12 +80,17 @@ private:
 public:
 	LoaderFunc1(FuncType f): func(f) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
 		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>());
 	}
 
-	virtual std::string get_signature() const
+	void execute(Loader &l, const ArgumentStore &as) const override
+	{
+		(dynamic_cast<L &>(l).*func)(as.get<A0>(0));
+	}
+
+	std::string get_signature() const override
 	{ return std::string(1, TypeInfo<A0>::signature); }
 };
 
@@ -88,16 +109,26 @@ private:
 public:
 	LoaderFunc1(FuncType f): func(f) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
 		std::vector<A0> values;
 		values.reserve(st.args.size());
-		for(Statement::Arguments::const_iterator i=st.args.begin(); i!=st.args.end(); ++i)
-			values.push_back(i->get<A0>());
+		for(const Value &a: st.args)
+			values.push_back(a.get<A0>());
+		(dynamic_cast<L &>(l).*func)(values);
+	}
+
+	void execute(Loader &l, const ArgumentStore &as) const override
+	{
+		std::vector<A0> values;
+		unsigned n_args = as.get_info().key.signature.size();
+		values.reserve(n_args);
+		for(unsigned i=0; i<n_args; ++i)
+			values.push_back(as.get<A0>(i));
 		(dynamic_cast<L &>(l).*func)(values);
 	}
 
-	virtual std::string get_signature() const
+	std::string get_signature() const override
 	{
 		std::string result;
 		result += TypeInfo<A0>::signature;
@@ -121,123 +152,109 @@ private:
 public:
 	LoaderFunc1(FuncType f): func(f) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
 		(dynamic_cast<L &>(l).*func)(st);
 	}
 
-	virtual std::string get_signature() const
+	void execute(Loader &, const ArgumentStore &) const override
+	{
+		throw std::logic_error("incompatible format");
+	}
+
+	std::string get_signature() const override
 	{ return "*"; }
 };
 
 
-template<typename L, typename A0, typename A1>
-class LoaderFunc2: public LoaderAction
-{
-private:
-	typedef void (L::*FuncType)(A0, A1);
-
-	FuncType func;
+template<unsigned I, typename... Args>
+struct Apply;
 
-public:
-	LoaderFunc2(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
+template<unsigned I>
+struct Apply<I>
+{
+	template<typename L, typename F, typename... Args>
+	static void apply(L &l, F func, const Statement &, Args &&... args)
 	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
+		(l.*func)(std::forward<Args>(args)...);
 	}
 
-	virtual std::string get_signature() const
+	template<typename L, typename F, typename... Args>
+	static void apply(L &l, F func, const ArgumentStore &, Args &&... args)
 	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		return result;
+		(l.*func)(std::forward<Args>(args)...);
 	}
 };
 
-
-template<typename L, typename A0, typename A1, typename A2>
-class LoaderFunc3: public LoaderAction
+template<unsigned I, typename Head, typename... Tail>
+struct Apply<I, Head, Tail...>
 {
-private:
-	typedef void (L::*FuncType)(A0, A1, A2);
-
-	FuncType func;
-
-public:
-	LoaderFunc3(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
+	template<typename L, typename F, typename... Args>
+	static void apply(L &l, F func, const Statement &st, Args &&... args)
 	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>());
+		Apply<I+1, Tail...>::apply(l, func, st, std::forward<Args>(args)..., std::move(st.args[I].get<Head>()));
 	}
 
-	virtual std::string get_signature() const
+	template<typename L, typename F, typename... Args>
+	static void apply(L &l, F func, const ArgumentStore &as, Args &&... args)
 	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		result += TypeInfo<A2>::signature;
-		return result;
+		Apply<I+1, Tail...>::apply(l, func, as, std::forward<Args>(args)..., std::move(as.get<Head>(I)));
 	}
 };
 
 
-template<typename L, typename A0, typename A1, typename A2, typename A3>
-class LoaderFunc4: public LoaderAction
+template<typename L, typename... Args>
+class LoaderFuncN: public LoaderAction
 {
-private:
-	typedef void (L::*FuncType)(A0, A1, A2, A3);
+protected:
+	typedef void (L::*FuncType)(Args...);
 
 	FuncType func;
 
 public:
-	LoaderFunc4(FuncType f): func(f) { }
+	LoaderFuncN(FuncType f): func(f) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>());
+		Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, st);
 	}
 
-	virtual std::string get_signature() const
+	void execute(Loader &l, const ArgumentStore &as) const override
 	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		result += TypeInfo<A2>::signature;
-		result += TypeInfo<A3>::signature;
-		return result;
+		Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, as);
 	}
+
+	std::string get_signature() const override
+	{ return create_signature<Args...>(); }
 };
 
 
-template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
-class LoaderFunc5: public LoaderAction
+template<typename L, typename B0, typename... Args>
+class LoaderFuncNBound1: public LoaderAction
 {
-private:
-	typedef void (L::*FuncType)(A0, A1, A2, A3, A4);
+protected:
+	typedef void (L::*FuncType)(B0, Args...);
+	typedef typename std::remove_reference<B0>::type Bound0Type;
 
 	FuncType func;
+	Bound0Type bound0;
 
 public:
-	LoaderFunc5(FuncType f): func(f) { }
+	LoaderFuncNBound1(FuncType f, const B0 &b0): func(f), bound0(b0) { }
+	LoaderFuncNBound1(FuncType f, B0 &&b0): func(f), bound0(std::move(b0)) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>(), st.args[4].get<A4>());
+		Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, st, bound0);
 	}
 
-	virtual std::string get_signature() const
+	void execute(Loader &l, const ArgumentStore &as) const override
 	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		result += TypeInfo<A2>::signature;
-		result += TypeInfo<A3>::signature;
-		result += TypeInfo<A4>::signature;
-		return result;
+		Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, as, bound0);
 	}
+
+	std::string get_signature() const override
+	{ return create_signature<Args...>(); }
 };
 
 
@@ -252,12 +269,17 @@ private:
 public:
 	LoadValue1(Pointer0Type p0): ptr0(p0) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
 		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = st.args[0].get<T0>();
 	}
 
-	virtual std::string get_signature() const
+	void execute(Loader &l, const ArgumentStore &as) const override
+	{
+		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = as.get<T0>(0);
+	}
+
+	std::string get_signature() const override
 	{ return std::string(1, TypeInfo<T0>::signature); }
 };
 
@@ -273,15 +295,19 @@ private:
 public:
 	LoadValue1(Pointer0Type p0): ptr0(p0) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
 		typename L::Loader &ldr = dynamic_cast<typename L::Loader &>(l);
-		if(!ldr.is_pointer_reload_allowed() && ldr.get_object().*ptr0)
-			throw InvalidState("The pointer has already been loaded");
-		ldr.get_object().*ptr0 = ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
+		ldr.get_object().*ptr0 = &ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
 	}
 
-	virtual std::string get_signature() const
+	void execute(Loader &l, const ArgumentStore &as) const override
+	{
+		typename L::Loader &ldr = dynamic_cast<typename L::Loader &>(l);
+		ldr.get_object().*ptr0 = &ldr.get_collection().template get<T0>(as.get<std::string>(0));
+	}
+
+	std::string get_signature() const override
 	{ return std::string(1, TypeInfo<std::string>::signature); }
 };
 
@@ -299,13 +325,19 @@ private:
 public:
 	LoadValue2(Pointer0Type p0, Pointer1Type p1): ptr0(p0), ptr1(p1) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
 		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = st.args[0].get<T0>();
 		dynamic_cast<typename L::Loader &>(l).get_object().*ptr1 = st.args[1].get<T1>();
 	}
 
-	virtual std::string get_signature() const
+	void execute(Loader &l, const ArgumentStore &as) const override
+	{
+		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = as.get<T0>(0);
+		dynamic_cast<typename L::Loader &>(l).get_object().*ptr1 = as.get<T1>(1);
+	}
+
+	std::string get_signature() const override
 	{
 		std::string result;
 		result += TypeInfo<T0>::signature;