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

diff --git a/source/loaderaction.h b/source/loaderaction.h
index 7e4feac..9e08dac 100644
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -8,7 +8,6 @@
 namespace Msp {
 namespace DataFile {
 
-#if __cplusplus>=201103L
 template<typename T>
 std::string create_signature(const std::string &prefix = std::string())
 { return prefix+std::string(1, TypeInfo<T>::signature); }
@@ -16,7 +15,6 @@ std::string create_signature(const std::string &prefix = std::string())
 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)); }
-#endif
 
 class Loader;
 
@@ -26,9 +24,9 @@ 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;
@@ -53,17 +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)();
 	};
 
-	virtual void execute(Loader &l, const ArgumentStore &) const
+	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(); }
 };
 
@@ -82,17 +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 void execute(Loader &l, const ArgumentStore &as) const
+	void execute(Loader &l, const ArgumentStore &as) const override
 	{
 		(dynamic_cast<L &>(l).*func)(as.get<A0>(0));
 	}
 
-	virtual std::string get_signature() const
+	std::string get_signature() const override
 	{ return std::string(1, TypeInfo<A0>::signature); }
 };
 
@@ -111,16 +109,16 @@ 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);
 	}
 
-	virtual void execute(Loader &l, const ArgumentStore &as) const
+	void execute(Loader &l, const ArgumentStore &as) const override
 	{
 		std::vector<A0> values;
 		unsigned n_args = as.get_info().key.signature.size();
@@ -130,7 +128,7 @@ public:
 		(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;
@@ -154,152 +152,21 @@ 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 void execute(Loader &, const ArgumentStore &) const
+	void execute(Loader &, const ArgumentStore &) const override
 	{
 		throw std::logic_error("incompatible format");
 	}
 
-	virtual std::string get_signature() const
+	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;
-
-public:
-	LoaderFunc2(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
-	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
-	}
-
-	virtual void execute(Loader &l, const ArgumentStore &as) const
-	{
-		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1));
-	}
-
-	virtual std::string get_signature() const
-	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		return result;
-	}
-};
-
-
-template<typename L, typename A0, typename A1, typename A2>
-class LoaderFunc3: public LoaderAction
-{
-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
-	{
-		(dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>());
-	}
-
-	virtual void execute(Loader &l, const ArgumentStore &as) const
-	{
-		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2));
-	}
-
-	virtual std::string get_signature() const
-	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		result += TypeInfo<A2>::signature;
-		return result;
-	}
-};
-
-
-template<typename L, typename A0, typename A1, typename A2, typename A3>
-class LoaderFunc4: public LoaderAction
-{
-private:
-	typedef void (L::*FuncType)(A0, A1, A2, A3);
-
-	FuncType func;
-
-public:
-	LoaderFunc4(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
-	{
-		(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>());
-	}
-
-	virtual void execute(Loader &l, const ArgumentStore &as) const
-	{
-		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2), as.get<A3>(3));
-	}
-
-	virtual std::string get_signature() const
-	{
-		std::string result;
-		result += TypeInfo<A0>::signature;
-		result += TypeInfo<A1>::signature;
-		result += TypeInfo<A2>::signature;
-		result += TypeInfo<A3>::signature;
-		return result;
-	}
-};
-
-
-template<typename L, typename A0, typename A1, typename A2, typename A3, typename A4>
-class LoaderFunc5: public LoaderAction
-{
-private:
-	typedef void (L::*FuncType)(A0, A1, A2, A3, A4);
-
-	FuncType func;
-
-public:
-	LoaderFunc5(FuncType f): func(f) { }
-
-	virtual void execute(Loader &l, const Statement &st) const
-	{
-		(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>());
-	}
-
-	virtual void execute(Loader &l, const ArgumentStore &as) const
-	{
-		(dynamic_cast<L &>(l).*func)(as.get<A0>(0), as.get<A1>(1), as.get<A2>(2), as.get<A3>(3), as.get<A4>(4));
-	}
-
-	virtual std::string get_signature() const
-	{
-		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;
-	}
-};
-
-
-#if __cplusplus>=201103L
 template<unsigned I, typename... Args>
 struct Apply;
 
@@ -307,15 +174,15 @@ template<unsigned I>
 struct Apply<I>
 {
 	template<typename L, typename F, typename... Args>
-	static void apply(L &l, F func, const Statement &, Args... args)
+	static void apply(L &l, F func, const Statement &, Args &&... args)
 	{
-		(l.*func)(args...);
+		(l.*func)(std::forward<Args>(args)...);
 	}
 
 	template<typename L, typename F, typename... Args>
-	static void apply(L &l, F func, const ArgumentStore &, Args... args)
+	static void apply(L &l, F func, const ArgumentStore &, Args &&... args)
 	{
-		(l.*func)(args...);
+		(l.*func)(std::forward<Args>(args)...);
 	}
 };
 
@@ -323,15 +190,15 @@ template<unsigned I, typename Head, typename... Tail>
 struct Apply<I, Head, Tail...>
 {
 	template<typename L, typename F, typename... Args>
-	static void apply(L &l, F func, const Statement &st, Args... args)
+	static void apply(L &l, F func, const Statement &st, Args &&... args)
 	{
-		Apply<I+1, Tail...>::apply(l, func, st, args..., st.args[I].get<Head>());
+		Apply<I+1, Tail...>::apply(l, func, st, std::forward<Args>(args)..., std::move(st.args[I].get<Head>()));
 	}
 
 	template<typename L, typename F, typename... Args>
-	static void apply(L &l, F func, const ArgumentStore &as, Args... args)
+	static void apply(L &l, F func, const ArgumentStore &as, Args &&... args)
 	{
-		Apply<I+1, Tail...>::apply(l, func, as, args..., as.get<Head>(I));
+		Apply<I+1, Tail...>::apply(l, func, as, std::forward<Args>(args)..., std::move(as.get<Head>(I)));
 	}
 };
 
@@ -347,21 +214,48 @@ protected:
 public:
 	LoaderFuncN(FuncType f): func(f) { }
 
-	virtual void execute(Loader &l, const Statement &st) const
+	void execute(Loader &l, const Statement &st) const override
 	{
 		Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, st);
 	}
 
-	virtual void execute(Loader &l, const ArgumentStore &as) const
+	void execute(Loader &l, const ArgumentStore &as) const override
 	{
 		Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, as);
 	}
 
-	virtual std::string get_signature() const
+	std::string get_signature() const override
 	{ return create_signature<Args...>(); }
 };
 
-#endif
+
+template<typename L, typename B0, typename... Args>
+class LoaderFuncNBound1: public LoaderAction
+{
+protected:
+	typedef void (L::*FuncType)(B0, Args...);
+	typedef typename std::remove_reference<B0>::type Bound0Type;
+
+	FuncType func;
+	Bound0Type bound0;
+
+public:
+	LoaderFuncNBound1(FuncType f, const B0 &b0): func(f), bound0(b0) { }
+	LoaderFuncNBound1(FuncType f, B0 &&b0): func(f), bound0(std::move(b0)) { }
+
+	void execute(Loader &l, const Statement &st) const override
+	{
+		Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, st, bound0);
+	}
+
+	void execute(Loader &l, const ArgumentStore &as) const override
+	{
+		Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, as, bound0);
+	}
+
+	std::string get_signature() const override
+	{ return create_signature<Args...>(); }
+};
 
 
 template<typename L, typename T0>
@@ -375,17 +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 void execute(Loader &l, const ArgumentStore &as) const
+	void execute(Loader &l, const ArgumentStore &as) const override
 	{
 		dynamic_cast<typename L::Loader &>(l).get_object().*ptr0 = as.get<T0>(0);
 	}
 
-	virtual std::string get_signature() const
+	std::string get_signature() const override
 	{ return std::string(1, TypeInfo<T0>::signature); }
 };
 
@@ -401,19 +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);
 		ldr.get_object().*ptr0 = &ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
 	}
 
-	virtual void execute(Loader &l, const ArgumentStore &as) 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));
 	}
 
-	virtual std::string get_signature() const
+	std::string get_signature() const override
 	{ return std::string(1, TypeInfo<std::string>::signature); }
 };
 
@@ -431,19 +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 void execute(Loader &l, const ArgumentStore &as) 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);
 	}
 
-	virtual std::string get_signature() const
+	std::string get_signature() const override
 	{
 		std::string result;
 		result += TypeInfo<T0>::signature;