StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

Additions for stack to properly handle std::function getters. std::function gets assume that the argument is a lua function and attempt to convert it to the type of function requested by the std::function's signature

Browse Source
This commit is contained in:
ThePhD 2014-05-30 18:19:12 -04:00
parent 5d5ce9cd2e
commit fb1eb21f34
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sol/function.hpp
View File

@ -31,27 +31,27 @@
namespace sol { namespace sol {
class function : public reference { class function : public reference {
private: private:
void luacall (std::size_t argcount, std::size_t resultcount) { void luacall (std::size_t argcount, std::size_t resultcount) const {
lua_call(state(), static_cast<uint32_t>(argcount), static_cast<uint32_t>(resultcount)); lua_call(state(), static_cast<uint32_t>(argcount), static_cast<uint32_t>(resultcount));
} }
template<typename... Ret> template<typename... Ret>
std::tuple<Ret...> invoke(types<Ret...>, std::size_t n) { std::tuple<Ret...> invoke(types<Ret...>, std::size_t n) const {
luacall(n, sizeof...(Ret)); luacall(n, sizeof...(Ret));
return stack::pop_reverse_call(state(), std::make_tuple<Ret...>, types<Ret...>()); return stack::pop_reverse_call(state(), std::make_tuple<Ret...>, types<Ret...>());
} }
template<typename Ret> template<typename Ret>
Ret invoke(types<Ret>, std::size_t n) { Ret invoke(types<Ret>, std::size_t n) const {
luacall(n, 1); luacall(n, 1);
return stack::pop<Ret>(state()); return stack::pop<Ret>(state());
} }
void invoke(types<void>, std::size_t n) { void invoke(types<void>, std::size_t n) const {
luacall(n, 0); luacall(n, 0);
} }
void invoke(types<>, std::size_t n) { void invoke(types<>, std::size_t n) const {
luacall(n, 0); luacall(n, 0);
} }
@ -64,17 +64,17 @@ public:
function& operator=(const function&) = default; function& operator=(const function&) = default;
template<typename... Args> template<typename... Args>
void operator()(Args&&... args) { void operator()(Args&&... args) const {
call<>(std::forward<Args>(args)...); call<>(std::forward<Args>(args)...);
} }
template<typename... Ret, typename... Args> template<typename... Ret, typename... Args>
typename return_type<Ret...>::type operator()(types<Ret...>, Args&&... args) { typename return_type<Ret...>::type operator()(types<Ret...>, Args&&... args) const {
return call<Ret...>(std::forward<Args>(args)...); return call<Ret...>(std::forward<Args>(args)...);
} }
template<typename... Ret, typename... Args> template<typename... Ret, typename... Args>
typename return_type<Ret...>::type call(Args&&... args) { typename return_type<Ret...>::type call(Args&&... args) const {
push(); push();
stack::push_args(state(), std::forward<Args>(args)...); stack::push_args(state(), std::forward<Args>(args)...);
return invoke(types<Ret...>(), sizeof...(Args)); return invoke(types<Ret...>(), sizeof...(Args));
@ -83,9 +83,36 @@ public:
namespace stack { namespace stack {
namespace detail { namespace detail {
template <typename Signature, typename... FxArgs, typename... Ret>
inline std::function<Signature> get_std_func(types<FxArgs...>, types<Ret...>, lua_State* L, int index = -1) {
typedef typename function_traits<Signature>::return_type return_t;
sol::function f(L, index);
auto fx = [ f, L, index ] (FxArgs&&... args) -> return_t {
return f(types<Ret...>(), std::forward<FxArgs>(args)...);
};
return std::move(fx);
}
template <typename Signature, typename... FxArgs>
inline std::function<Signature> get_std_func(types<FxArgs...>, types<void>, lua_State* L, int index = -1) {
sol::function f(L, index);
auto fx = [ f, L, index ] (FxArgs&&... args) -> void {
f(std::forward<FxArgs>(args)...);
};
return std::move(fx);
}
template <typename Signature, typename... FxArgs>
inline std::function<Signature> get_std_func(types<FxArgs...> t, types<>, lua_State* L, int index = -1) {
return get_std_func<Signature>(std::move(t), types<void>(), L, index);
}
template <typename Signature> template <typename Signature>
inline std::function<Signature> get(types<std::function<Signature>>, lua_State* L, int index = -1) { inline std::function<Signature> get(types<std::function<Signature>>, lua_State* L, int index = -1) {
return std::function<Signature>(sol::function(L, index)); typedef typename function_traits<Signature> fx_t;
typedef typename fx_t::args_type args_t;
typedef typename tuple_types<typename fx_t::return_type>::types_type ret_t;
return get_std_func<Signature>(args_t(), ret_t(), L, index);
} }
} // detail } // detail
} // stack } // stack