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

Slight refactoring of implementation. Also, stray #endif due to not being recognized by include guard regex -- the formula must be kept...!

Browse Source 
(TODO: transition sol2 to include guards...?)
This commit is contained in:
ThePhD 2016-06-20 07:03:44 -04:00
parent 6cc8676bc7
commit 0faacb5d2c
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sol/bind_traits.hpp
View File

@ -239,4 +239,4 @@ namespace sol {
} // meta } // meta
} // sol } // sol
#endif // SOL_BIND_TRAITS #endif // SOL_BIND_TRAITS_HPP

10
sol/function.hpp
View File

@ -105,9 +105,6 @@ namespace sol {
template<typename... Args, typename... Ret> template<typename... Args, typename... Ret>
static std::function<Signature> get_std_func(types<Ret...>, types<Args...>, lua_State* L, int index = -1) { static std::function<Signature> get_std_func(types<Ret...>, types<Args...>, lua_State* L, int index = -1) {
if (lua_isnil(L, index) || lua_isnone(L, index)) {
return nullptr;
}
sol::function f(L, index); sol::function f(L, index);
auto fx = [f, L, index](Args&&... args) -> meta::return_type_t<Ret...> { auto fx = [f, L, index](Args&&... args) -> meta::return_type_t<Ret...> {
return f.call<Ret...>(std::forward<Args>(args)...); return f.call<Ret...>(std::forward<Args>(args)...);
@ -117,9 +114,6 @@ namespace sol {
template<typename... FxArgs> template<typename... FxArgs>
static std::function<Signature> get_std_func(types<void>, types<FxArgs...>, lua_State* L, int index = -1) { static std::function<Signature> get_std_func(types<void>, types<FxArgs...>, lua_State* L, int index = -1) {
if (lua_isnil(L, index) || lua_isnone(L, index)) {
return nullptr;
}
sol::function f(L, index); sol::function f(L, index);
auto fx = [f, L, index](FxArgs&&... args) -> void { auto fx = [f, L, index](FxArgs&&... args) -> void {
f(std::forward<FxArgs>(args)...); f(std::forward<FxArgs>(args)...);
@ -133,6 +127,10 @@ namespace sol {
} }
static std::function<Signature> get(lua_State* L, int index) { static std::function<Signature> get(lua_State* L, int index) {
type t = type_of(L, index);
if (t == type::none || t == type::nil) {
return nullptr;
}
return get_std_func(return_types(), args_lists(), L, index); return get_std_func(return_types(), args_lists(), L, index);
} }
}; };

3
sol/stack_check.hpp
View File

@ -196,7 +196,8 @@ namespace sol {
template <typename Handler> template <typename Handler>
static bool check(lua_State* L, int index, Handler&& handler) { static bool check(lua_State* L, int index, Handler&& handler) {
type t = type_of(L, index); type t = type_of(L, index);
if (t == type::function) { if (t == type::nil || t == type::none || t == type::function) {
// allow for nil to be returned
return true; return true;
} }
if (t != type::userdata && t != type::table) { if (t != type::userdata && t != type::table) {