Support loader functions with bound first argument

This allows more flexibility in defining dynamic keywords.  Only
available with C++11.

diff --git a/source/loader.h b/source/loader.h
index 02caaaf9ee75dce3ca573cf929611124e551053f..7799a7eacb5dd404915f25cbfe87f0665f515436 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -120,6 +120,14 @@ protected:
        { 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>
        void add(const std::string &k, T0 L::*p0)

diff --git a/source/loaderaction.h b/source/loaderaction.h
index 7e4feac613eba7afab54fec62c07b294c28f56ea..a3b04437d279e3e6835bd20538d2c99311721064 100644 (file)
--- a/source/loaderaction.h
+++ b/source/loaderaction.h
@@ -361,6 +361,33 @@ public:
        { return create_signature<Args...>(); }
 };
 
+
+template<typename L, typename B0, typename... Args>
+class LoaderFuncNBound1: public LoaderAction
+{
+protected:
+       typedef void (L::*FuncType)(B0, Args...);
+       typedef typename RemoveReference<B0>::Type Bound0Type;
+
+       FuncType func;
+       Bound0Type bound0;
+
+public:
+       LoaderFuncNBound1(FuncType f, const Bound0Type &b0): func(f), bound0(b0) { }
+
+       virtual void execute(Loader &l, const Statement &st) const
+       {
+               Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, st, bound0);
+       }
+
+       virtual void execute(Loader &l, const ArgumentStore &as) const
+       {
+               Apply<0, Args...>::apply(dynamic_cast<L &>(l), func, as, bound0);
+       }
+
+       virtual std::string get_signature() const
+       { return create_signature<Args...>(); }
+};
 #endif