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

who knew noexcept proofing would be so hard...? And there's so many places it could be activated in...!

Browse Source
This commit is contained in:
ThePhD 2017-06-17 00:43:26 -04:00
parent 11916a7c72
commit b811e73b90
13 changed files with 446 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

407
single/sol/sol.hpp
View File

@ -20,8 +20,8 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// This file was generated with a script. // This file was generated with a script.
// Generated 2017-06-16 19:36:12.857631 UTC // Generated 2017-06-17 04:42:58.829253 UTC
// This header was generated with sol v2.17.5 (revision 39fdb5e) // This header was generated with sol v2.17.5 (revision 11916a7)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -47,6 +47,9 @@
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wconversion"
#if __GNUC__ > 6
#pragma GCC diagnostic ignored "-Wnoexcept-type"
#endif
#elif defined _MSC_VER #elif defined _MSC_VER
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4324 ) // structure was padded due to alignment specifier #pragma warning( disable : 4324 ) // structure was padded due to alignment specifier
@ -160,6 +163,84 @@ namespace sol {
// beginning of sol/bind_traits.hpp // beginning of sol/bind_traits.hpp
// beginning of sol/feature_test.hpp
#if defined(__cpp_noexcept_function_type)
#ifndef SOL_NOEXCEPT_FUNCTION_TYPE
#define SOL_NOEXCEPT_FUNCTION_TYPE 1
#endif // noexcept is part of a function's type
#endif
#if defined(_WIN32) || defined(_MSC_VER)
#ifndef SOL_CODECVT_SUPPORT
#define SOL_CODECVT_SUPPORT 1
#endif // sol codecvt support
#elif defined(__GNUC__)
#if __GNUC__ >= 5
#ifndef SOL_CODECVT_SUPPORT
#define SOL_CODECVT_SUPPORT 1
#endif // codecvt support
#endif // g++ 5.x.x (MinGW too)
#else
#endif // Windows/VC++ vs. g++ vs Others
#ifdef _MSC_VER
#ifdef _DEBUG
#ifndef NDEBUG
#ifndef SOL_CHECK_ARGUMENTS
#endif // Check Arguments
#ifndef SOL_SAFE_USERTYPE
#define SOL_SAFE_USERTYPE
#endif // Safe Usertypes
#endif // NDEBUG
#endif // Debug
#ifndef _CPPUNWIND
#ifndef SOL_NO_EXCEPTIONS
#define SOL_NO_EXCEPTIONS 1
#endif
#endif // Automatic Exceptions
#ifndef _CPPRTTI
#ifndef SOL_NO_RTTI
#define SOL_NO_RTTI 1
#endif
#endif // Automatic RTTI
#elif defined(__GNUC__) || defined(__clang__)
#ifndef NDEBUG
#ifndef __OPTIMIZE__
#ifndef SOL_CHECK_ARGUMENTS
#endif // Check Arguments
#ifndef SOL_SAFE_USERTYPE
#define SOL_SAFE_USERTYPE
#endif // Safe Usertypes
#endif // g++ optimizer flag
#endif // Not Debug
#ifndef __EXCEPTIONS
#ifndef SOL_NO_EXCEPTIONS
#define SOL_NO_EXCEPTIONS 1
#endif
#endif // No Exceptions
#ifndef __GXX_RTTI
#ifndef SOL_NO_RTII
#define SOL_NO_RTTI 1
#endif
#endif // No RTTI
#endif // vc++ || clang++/g++
#ifndef SOL_SAFE_USERTYPE
#ifdef SOL_CHECK_ARGUMENTS
#define SOL_SAFE_USERTYPE
#endif // Turn on Safety for all
#endif // Safe Usertypes
// end of sol/feature_test.hpp
namespace sol { namespace sol {
namespace meta { namespace meta {
namespace meta_detail { namespace meta_detail {
@ -337,113 +418,113 @@ namespace sol {
template<typename R, typename... Args> template<typename R, typename... Args>
struct fx_traits<R(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> { struct fx_traits<R(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
typedef R(*function_pointer_type)(Args...); typedef R(*function_pointer_type)(Args...) noexcept;
}; };
template<typename R, typename... Args> template<typename R, typename... Args>
struct fx_traits<R(*)(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> { struct fx_traits<R(*)(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
typedef R(*function_pointer_type)(Args...); typedef R(*function_pointer_type)(Args...) noexcept;
}; };
template<typename R, typename... Args> template<typename R, typename... Args>
struct fx_traits<R(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> { struct fx_traits<R(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
typedef R(*function_pointer_type)(Args..., ...); typedef R(*function_pointer_type)(Args..., ...) noexcept;
}; };
template<typename R, typename... Args> template<typename R, typename... Args>
struct fx_traits<R(*)(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> { struct fx_traits<R(*)(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
typedef R(*function_pointer_type)(Args..., ...); typedef R(*function_pointer_type)(Args..., ...) noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...); typedef R(T::* function_pointer_type)(Args...) noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...); typedef R(T::* function_pointer_type)(Args..., ...) noexcept;
}; };
/* Const Volatile */ /* Const Volatile */
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const; typedef R(T::* function_pointer_type)(Args...) const noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const; typedef R(T::* function_pointer_type)(Args..., ...) const noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const volatile noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const volatile noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const volatile; typedef R(T::* function_pointer_type)(Args...) const volatile noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const volatile noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const volatile noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const volatile; typedef R(T::* function_pointer_type)(Args..., ...) const volatile noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) & noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) & noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) &; typedef R(T::* function_pointer_type)(Args...) & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) & noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) & noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) &; typedef R(T::* function_pointer_type)(Args..., ...) & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const & noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const & noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const &; typedef R(T::* function_pointer_type)(Args...) const & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const & noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const & noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const &; typedef R(T::* function_pointer_type)(Args..., ...) const & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const volatile & noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const volatile & noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const volatile &; typedef R(T::* function_pointer_type)(Args...) const volatile & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const volatile & noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const volatile & noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const volatile &; typedef R(T::* function_pointer_type)(Args..., ...) const volatile & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) && noexcept , false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) && noexcept , false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) && ; typedef R(T::* function_pointer_type)(Args...) && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) && noexcept , false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) && noexcept , false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) && ; typedef R(T::* function_pointer_type)(Args..., ...) && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const && noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const && noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const &&; typedef R(T::* function_pointer_type)(Args...) const && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const && noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const && noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const &&; typedef R(T::* function_pointer_type)(Args..., ...) const && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const volatile && noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const volatile && noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const volatile &&; typedef R(T::* function_pointer_type)(Args...) const volatile && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const volatile && noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const volatile && noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const volatile &&; typedef R(T::* function_pointer_type)(Args..., ...) const volatile && noexcept;
}; };
#endif // noexcept is part of a function's type #endif // noexcept is part of a function's type
@ -938,25 +1019,6 @@ namespace sol {
#include <lua.hpp> #include <lua.hpp>
#endif // C++ Mangling for Lua #endif // C++ Mangling for Lua
#if defined(__cpp_noexcept_function_type) && (__cpp_noexcept_function_type >= 201510L)
#ifndef SOL_NOEXCEPT_FUNCTION_TYPE
#define SOL_NOEXCEPT_FUNCTION_TYPE 1
#endif // noexcept is part of a function's type
#endif
#if defined(_WIN32) || defined(_MSC_VER)
#ifndef SOL_CODECVT_SUPPORT
#define SOL_CODECVT_SUPPORT 1
#endif // sol codecvt support
#elif defined(__GNUC__)
#if __GNUC__ >= 5
#ifndef SOL_CODECVT_SUPPORT
#define SOL_CODECVT_SUPPORT 1
#endif // codecvt support
#endif // g++ 5.x.x (MinGW too)
#else
#endif // Windows/VC++ vs. g++ vs Others
#ifdef LUAJIT_VERSION #ifdef LUAJIT_VERSION
#ifndef SOL_LUAJIT #ifndef SOL_LUAJIT
#define SOL_LUAJIT #define SOL_LUAJIT
@ -974,61 +1036,6 @@ namespace sol {
#define SOL_LUA_VERSION 502 #define SOL_LUA_VERSION 502
#endif // Lua Version 502, 501 || luajit, 500 #endif // Lua Version 502, 501 || luajit, 500
#ifdef _MSC_VER
#ifdef _DEBUG
#ifndef NDEBUG
#ifndef SOL_CHECK_ARGUMENTS
#endif // Check Arguments
#ifndef SOL_SAFE_USERTYPE
#define SOL_SAFE_USERTYPE
#endif // Safe Usertypes
#endif // NDEBUG
#endif // Debug
#ifndef _CPPUNWIND
#ifndef SOL_NO_EXCEPTIONS
#define SOL_NO_EXCEPTIONS 1
#endif
#endif // Automatic Exceptions
#ifndef _CPPRTTI
#ifndef SOL_NO_RTTI
#define SOL_NO_RTTI 1
#endif
#endif // Automatic RTTI
#elif defined(__GNUC__) || defined(__clang__)
#ifndef NDEBUG
#ifndef __OPTIMIZE__
#ifndef SOL_CHECK_ARGUMENTS
#endif // Check Arguments
#ifndef SOL_SAFE_USERTYPE
#define SOL_SAFE_USERTYPE
#endif // Safe Usertypes
#endif // g++ optimizer flag
#endif // Not Debug
#ifndef __EXCEPTIONS
#ifndef SOL_NO_EXCEPTIONS
#define SOL_NO_EXCEPTIONS 1
#endif
#endif // No Exceptions
#ifndef __GXX_RTTI
#ifndef SOL_NO_RTII
#define SOL_NO_RTTI 1
#endif
#endif // No RTTI
#endif // vc++ || clang++/g++
#ifndef SOL_SAFE_USERTYPE
#ifdef SOL_CHECK_ARGUMENTS
#define SOL_SAFE_USERTYPE
#endif // Turn on Safety for all
#endif // Safe Usertypes
// end of sol/compatibility/version.hpp // end of sol/compatibility/version.hpp
#ifndef SOL_NO_COMPAT #ifndef SOL_NO_COMPAT
@ -3172,16 +3179,23 @@ namespace sol {
#ifdef SOL_NO_EXCEPTIONS #ifdef SOL_NO_EXCEPTIONS
template <lua_CFunction f> template <lua_CFunction f>
int static_trampoline(lua_State* L) { int static_trampoline(lua_State* L) noexcept {
return f(L); return f(L);
} }
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE
template <lua_CFunction_noexcept f>
int static_trampoline_noexcept(lua_State* L) noexcept {
return f(L);
}
#endif
template <typename Fx, typename... Args> template <typename Fx, typename... Args>
int trampoline(lua_State* L, Fx&& f, Args&&... args) { int trampoline(lua_State* L, Fx&& f, Args&&... args) noexcept {
return f(L, std::forward<Args>(args)...); return f(L, std::forward<Args>(args)...);
} }
inline int c_trampoline(lua_State* L, lua_CFunction f) { inline int c_trampoline(lua_State* L, lua_CFunction f) noexcept {
return trampoline(L, f); return trampoline(L, f);
} }
#else #else
@ -3198,7 +3212,6 @@ namespace sol {
} }
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) #if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION)
catch (...) { catch (...) {
std::exception_ptr eptr = std::current_exception();
lua_pushstring(L, "caught (...) exception"); lua_pushstring(L, "caught (...) exception");
} }
#endif #endif
@ -3206,24 +3219,20 @@ namespace sol {
} }
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE #ifdef SOL_NOEXCEPT_FUNCTION_TYPE
#if 0
template <lua_CFunction_noexcept f> template <lua_CFunction_noexcept f>
int static_trampoline(lua_State* L) { int static_trampoline(lua_State* L) noexcept {
try { #else
return f(L); template <lua_CFunction_noexcept f>
} int static_trampoline_noexcept(lua_State* L) noexcept {
catch (const char *s) { #endif // impossible
lua_pushstring(L, s); return f(L);
} }
catch (const std::exception& e) {
lua_pushstring(L, e.what()); #else
} template <lua_CFunction f>
#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) int static_trampoline_noexcept(lua_State* L) noexcept {
catch (...) { return f(L);
std::exception_ptr eptr = std::current_exception();
lua_pushstring(L, "caught (...) exception");
}
#endif
return lua_error(L);
} }
#endif // noexcept lua_CFunction type #endif // noexcept lua_CFunction type
@ -3254,6 +3263,21 @@ namespace sol {
} }
#endif // Exceptions vs. No Exceptions #endif // Exceptions vs. No Exceptions
template <typename F, F fx>
inline int typed_static_trampoline_raw(std::true_type, lua_State* L) {
return static_trampoline_noexcept<fx>(L);
}
template <typename F, F fx>
inline int typed_static_trampoline_raw(std::false_type, lua_State* L) {
return static_trampoline<fx>(L);
}
template <typename F, F fx>
inline int typed_static_trampoline(lua_State* L) {
return typed_static_trampoline_raw<F, fx>(std::integral_constant<bool, meta::bind_traits<F>::is_noexcept>(), L);
}
template <typename T> template <typename T>
struct unique_usertype {}; struct unique_usertype {};
@ -6788,6 +6812,23 @@ namespace sol {
return 1; return 1;
} }
}; };
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE
template<>
struct pusher<std::remove_pointer_t<detail::lua_CFunction_noexcept>> {
static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
lua_pushcclosure(L, func, n);
return 1;
}
};
template<>
struct pusher<detail::lua_CFunction_noexcept> {
static int push(lua_State* L, detail::lua_CFunction_noexcept func, int n = 0) {
lua_pushcclosure(L, func, n);
return 1;
}
};
#endif // noexcept function type
template<> template<>
struct pusher<c_closure> { struct pusher<c_closure> {
@ -7977,7 +8018,7 @@ namespace sol {
template <typename F, typename = void> template <typename F, typename = void>
struct wrapper { struct wrapper {
typedef lua_bind_traits<F> traits_type; typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
typedef typename traits_type::args_list args_list; typedef typename traits_type::args_list args_list;
typedef typename traits_type::args_list free_args_list; typedef typename traits_type::args_list free_args_list;
typedef typename traits_type::returns_list returns_list; typedef typename traits_type::returns_list returns_list;
@ -7996,8 +8037,8 @@ namespace sol {
}; };
template <typename F> template <typename F>
struct wrapper<F, std::enable_if_t<std::is_function<meta::unqualified_t<std::remove_pointer_t<F>>>::value>> { struct wrapper<F, std::enable_if_t<std::is_function<std::remove_pointer_t<meta::unqualified_t<F>>>::value>> {
typedef lua_bind_traits<F> traits_type; typedef lua_bind_traits<std::remove_pointer_t<meta::unqualified_t<F>>> traits_type;
typedef typename traits_type::args_list args_list; typedef typename traits_type::args_list args_list;
typedef typename traits_type::args_list free_args_list; typedef typename traits_type::args_list free_args_list;
typedef typename traits_type::returns_list returns_list; typedef typename traits_type::returns_list returns_list;
@ -8030,7 +8071,7 @@ namespace sol {
template <typename F> template <typename F>
struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> { struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> {
typedef lua_bind_traits<F> traits_type; typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
typedef typename traits_type::object_type object_type; typedef typename traits_type::object_type object_type;
typedef typename traits_type::return_type return_type; typedef typename traits_type::return_type return_type;
typedef typename traits_type::args_list args_list; typedef typename traits_type::args_list args_list;
@ -8630,6 +8671,14 @@ namespace sol {
return f(L); return f(L);
} }
}; };
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE
template <bool is_index, bool is_variable, bool checked, int boost, typename C>
struct agnostic_lua_call_wrapper<detail::lua_CFunction_noexcept, is_index, is_variable, checked, boost, C> {
static int call(lua_State* L, detail::lua_CFunction_noexcept f) {
return f(L);
}
};
#endif // noexcept function types
template <bool is_index, bool is_variable, bool checked, int boost, typename C> template <bool is_index, bool is_variable, bool checked, int boost, typename C>
struct agnostic_lua_call_wrapper<no_prop, is_index, is_variable, checked, boost, C> { struct agnostic_lua_call_wrapper<no_prop, is_index, is_variable, checked, boost, C> {
@ -9113,7 +9162,7 @@ namespace sol {
} }
template <typename F, F fx> template <typename F, F fx>
int call_wrapper_entry(lua_State* L) { int call_wrapper_entry(lua_State* L) noexcept(meta::bind_traits<F>::is_noexcept) {
return call_wrapper_function<F, fx>(std::is_member_function_pointer<meta::unqualified_t<F>>(), L); return call_wrapper_function<F, fx>(std::is_member_function_pointer<meta::unqualified_t<F>>(), L);
} }
@ -9126,15 +9175,30 @@ namespace sol {
} }
}; };
template <typename F, F fx>
inline int c_call_raw(std::true_type, lua_State* L) {
return fx(L);
}
template <typename F, F fx>
inline int c_call_raw(std::false_type, lua_State* L) {
#ifdef __clang__
return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
#else
return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), &function_detail::call_wrapper_entry<F, fx>>(L);
#endif // fuck you clang :c
}
} // function_detail } // function_detail
template <typename F, F fx> template <typename F, F fx>
inline int c_call(lua_State* L) { inline int c_call(lua_State* L) {
#ifdef __clang__ typedef meta::unqualified_t<F> Fu;
return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>); return function_detail::c_call_raw<F, fx>(std::integral_constant<bool, std::is_same<Fu, lua_CFunction>::value
#else #ifdef SOL_NOEXCEPT_FUNCTION_TYPE
return detail::static_trampoline<(&function_detail::call_wrapper_entry<F, fx>)>(L); || std::is_same<Fu, detail::lua_CFunction_noexcept>::value
#endif // fuck you clang :c #endif
>(), L);
} }
template <typename F, F f> template <typename F, F f>
@ -9167,16 +9231,16 @@ namespace sol {
template<typename Function> template<typename Function>
struct upvalue_free_function { struct upvalue_free_function {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef meta::bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L); auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L);
function_type* fx = udata.first; function_type* fx = udata.first;
return call_detail::call_wrapped<void, true, false>(L, fx); return call_detail::call_wrapped<void, true, false>(L, fx);
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -9189,7 +9253,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
// Layout: // Layout:
// idx 1...n: verbatim data of member function pointer // idx 1...n: verbatim data of member function pointer
// idx n + 1: is the object's void pointer // idx n + 1: is the object's void pointer
@ -9203,7 +9267,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -9216,7 +9280,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
// idx n + 1: is the object's void pointer // idx n + 1: is the object's void pointer
@ -9237,7 +9301,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -9250,7 +9314,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
// idx n + 1: is the object's void pointer // idx n + 1: is the object's void pointer
@ -9269,7 +9333,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -9282,7 +9346,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L); auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
@ -9291,7 +9355,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -9302,9 +9366,8 @@ namespace sol {
template<typename T, typename Function> template<typename T, typename Function>
struct upvalue_this_member_variable { struct upvalue_this_member_variable {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(false) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L); auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
@ -9320,7 +9383,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -9333,7 +9396,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(false) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L); auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
@ -9347,7 +9410,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -9365,11 +9428,11 @@ namespace sol {
namespace function_detail { namespace function_detail {
template<typename Func> template<typename Func>
struct functor_function { struct functor_function {
typedef meta::unwrapped_t<meta::unqualified_t<Func>> Function; typedef std::decay_t<meta::unwrap_unqualified_t<Func>> function_type;
Function fx; function_type fx;
template<typename... Args> template<typename... Args>
functor_function(Function f, Args&&... args) : fx(std::move(f), std::forward<Args>(args)...) {} functor_function(function_type f, Args&&... args) : fx(std::move(f), std::forward<Args>(args)...) {}
int call(lua_State* L) { int call(lua_State* L) {
return call_detail::call_wrapped<void, true, false>(L, fx); return call_detail::call_wrapped<void, true, false>(L, fx);
@ -9779,9 +9842,15 @@ namespace sol {
stack::push(L, f); stack::push(L, f);
} }
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE
static void select_function(std::true_type, lua_State* L, detail::lua_CFunction_noexcept f) {
stack::push(L, f);
}
#endif // noexcept function type
template <typename Fx, typename... Args, meta::disable<meta::any<std::is_base_of<reference, meta::unqualified_t<Fx>>, std::is_base_of<stack_reference, meta::unqualified_t<Fx>>>> = meta::enabler> template <typename Fx, typename... Args, meta::disable<meta::any<std::is_base_of<reference, meta::unqualified_t<Fx>>, std::is_base_of<stack_reference, meta::unqualified_t<Fx>>>> = meta::enabler>
static void select(lua_State* L, Fx&& fx, Args&&... args) { static void select(lua_State* L, Fx&& fx, Args&&... args) {
select_function(std::is_function<meta::unqualified_t<Fx>>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...); select_function(std::is_function<std::remove_pointer_t<meta::unqualified_t<Fx>>>(), L, std::forward<Fx>(fx), std::forward<Args>(args)...);
} }
template <typename Fx, meta::enable<meta::any<std::is_base_of<reference, meta::unqualified_t<Fx>>, std::is_base_of<stack_reference, meta::unqualified_t<Fx>>>> = meta::enabler> template <typename Fx, meta::enable<meta::any<std::is_base_of<reference, meta::unqualified_t<Fx>>, std::is_base_of<stack_reference, meta::unqualified_t<Fx>>>> = meta::enabler>
@ -9843,7 +9912,15 @@ namespace sol {
}; };
template<typename Signature> template<typename Signature>
struct pusher<Signature, std::enable_if_t<meta::all<std::is_function<Signature>, meta::neg<std::is_same<Signature, lua_CFunction>>, meta::neg<std::is_same<Signature, std::remove_pointer_t<lua_CFunction>>>>::value>> { struct pusher<Signature, std::enable_if_t<meta::all<
std::is_function<Signature>,
meta::neg<std::is_same<Signature, lua_CFunction>>,
meta::neg<std::is_same<Signature, std::remove_pointer_t<lua_CFunction>>>
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE
, meta::neg<std::is_same<Signature, detail::lua_CFunction_noexcept>>,
meta::neg<std::is_same<Signature, std::remove_pointer_t<detail::lua_CFunction_noexcept>>>
#endif // noexcept function types
>::value>> {
template <typename F> template <typename F>
static int push(lua_State* L, F&& f) { static int push(lua_State* L, F&& f) {
return pusher<function_sig<>>{}.push(L, std::forward<F>(f)); return pusher<function_sig<>>{}.push(L, std::forward<F>(f));
@ -11623,20 +11700,20 @@ namespace sol {
template <std::size_t Idx, bool is_index = true, bool is_variable = false> template <std::size_t Idx, bool is_index = true, bool is_variable = false>
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call<Idx, is_index, is_variable>)>(L); return detail::typed_static_trampoline<decltype(&real_call<Idx, is_index, is_variable>), (&real_call<Idx, is_index, is_variable>)>(L);
} }
template <std::size_t Idx, bool is_index = true, bool is_variable = false> template <std::size_t Idx, bool is_index = true, bool is_variable = false>
static int call_with(lua_State* L) { static int call_with(lua_State* L) {
return detail::static_trampoline<(&real_call_with<Idx, is_index, is_variable>)>(L); return detail::typed_static_trampoline<decltype(&real_call_with<Idx, is_index, is_variable>), (&real_call_with<Idx, is_index, is_variable>)>(L);
} }
static int index_call(lua_State* L) { static int index_call(lua_State* L) {
return detail::static_trampoline<(&real_index_call)>(L); return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
} }
static int new_index_call(lua_State* L) { static int new_index_call(lua_State* L) {
return detail::static_trampoline<(&real_new_index_call)>(L); return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
} }
virtual int push_um(lua_State* L) override { virtual int push_um(lua_State* L) override {
@ -11922,7 +11999,7 @@ namespace sol {
#if defined(__clang__) #if defined(__clang__)
return detail::trampoline(L, &simple_real_index_call<T, has_indexing>); return detail::trampoline(L, &simple_real_index_call<T, has_indexing>);
#else #else
return detail::static_trampoline<(&simple_real_index_call<T, has_indexing>)>(L); return detail::typed_static_trampoline<decltype(&simple_real_index_call<T, has_indexing>), (&simple_real_index_call<T, has_indexing>)>(L);
#endif #endif
} }
@ -11931,7 +12008,7 @@ namespace sol {
#if defined(__clang__) #if defined(__clang__)
return detail::trampoline(L, &simple_real_new_index_call<T, has_indexing>); return detail::trampoline(L, &simple_real_new_index_call<T, has_indexing>);
#else #else
return detail::static_trampoline<(&simple_real_new_index_call<T, has_indexing>)>(L); return detail::typed_static_trampoline<decltype(&simple_real_new_index_call<T, has_indexing>), (&simple_real_new_index_call<T, has_indexing>)>(L);
#endif #endif
} }
} }
@ -12790,39 +12867,39 @@ namespace sol {
} }
static int add_call(lua_State*L) { static int add_call(lua_State*L) {
return detail::static_trampoline<(&real_add_call)>(L); return detail::typed_static_trampoline<decltype(&real_add_call), &real_add_call>(L);
} }
static int insert_call(lua_State*L) { static int insert_call(lua_State*L) {
return detail::static_trampoline<(&real_insert_call)>(L); return detail::typed_static_trampoline<decltype(&real_insert_call), &real_insert_call>(L);
} }
static int clear_call(lua_State*L) { static int clear_call(lua_State*L) {
return detail::static_trampoline<(&real_clear_call)>(L); return detail::typed_static_trampoline<decltype(&real_clear_call), &real_clear_call>(L);
} }
static int find_call(lua_State*L) { static int find_call(lua_State*L) {
return detail::static_trampoline<(&real_find_call)>(L); return detail::typed_static_trampoline<decltype(&real_find_call), &real_find_call>(L);
} }
static int length_call(lua_State*L) { static int length_call(lua_State*L) {
return detail::static_trampoline<(&real_length_call)>(L); return detail::typed_static_trampoline<decltype(&real_length_call), &real_length_call>(L);
} }
static int pairs_next_call(lua_State*L) { static int pairs_next_call(lua_State*L) {
return detail::static_trampoline<(&real_pairs_next_call)>(L); return detail::typed_static_trampoline<decltype(&real_pairs_next_call), &real_pairs_next_call>(L);
} }
static int pairs_call(lua_State*L) { static int pairs_call(lua_State*L) {
return detail::static_trampoline<(&real_pairs_call)>(L); return detail::typed_static_trampoline<decltype(&real_pairs_call), &real_pairs_call>(L);
} }
static int index_call(lua_State*L) { static int index_call(lua_State*L) {
return detail::static_trampoline<(&real_index_call)>(L); return detail::typed_static_trampoline<decltype(&real_index_call), &real_index_call>(L);
} }
static int new_index_call(lua_State*L) { static int new_index_call(lua_State*L) {
return detail::static_trampoline<(&real_new_index_call)>(L); return detail::typed_static_trampoline<decltype(&real_new_index_call), &real_new_index_call>(L);
} }
}; };

45
sol/bind_traits.hpp
View File

@ -22,6 +22,7 @@
#ifndef SOL_BIND_TRAITS_HPP #ifndef SOL_BIND_TRAITS_HPP
#define SOL_BIND_TRAITS_HPP #define SOL_BIND_TRAITS_HPP
#include "feature_test.hpp"
#include "tuple.hpp" #include "tuple.hpp"
namespace sol { namespace sol {
@ -201,113 +202,113 @@ namespace sol {
template<typename R, typename... Args> template<typename R, typename... Args>
struct fx_traits<R(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> { struct fx_traits<R(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
typedef R(*function_pointer_type)(Args...); typedef R(*function_pointer_type)(Args...) noexcept;
}; };
template<typename R, typename... Args> template<typename R, typename... Args>
struct fx_traits<R(*)(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> { struct fx_traits<R(*)(Args...) noexcept, false> : basic_traits<true, false, void, R, Args...> {
typedef R(*function_pointer_type)(Args...); typedef R(*function_pointer_type)(Args...) noexcept;
}; };
template<typename R, typename... Args> template<typename R, typename... Args>
struct fx_traits<R(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> { struct fx_traits<R(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
typedef R(*function_pointer_type)(Args..., ...); typedef R(*function_pointer_type)(Args..., ...) noexcept;
}; };
template<typename R, typename... Args> template<typename R, typename... Args>
struct fx_traits<R(*)(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> { struct fx_traits<R(*)(Args..., ...) noexcept, false> : basic_traits<true, true, void, R, Args...> {
typedef R(*function_pointer_type)(Args..., ...); typedef R(*function_pointer_type)(Args..., ...) noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...); typedef R(T::* function_pointer_type)(Args...) noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...); typedef R(T::* function_pointer_type)(Args..., ...) noexcept;
}; };
/* Const Volatile */ /* Const Volatile */
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const; typedef R(T::* function_pointer_type)(Args...) const noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const; typedef R(T::* function_pointer_type)(Args..., ...) const noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const volatile noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const volatile noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const volatile; typedef R(T::* function_pointer_type)(Args...) const volatile noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const volatile noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const volatile noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const volatile; typedef R(T::* function_pointer_type)(Args..., ...) const volatile noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) & noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) & noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) &; typedef R(T::* function_pointer_type)(Args...) & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) & noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) & noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) &; typedef R(T::* function_pointer_type)(Args..., ...) & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const & noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const & noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const &; typedef R(T::* function_pointer_type)(Args...) const & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const & noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const & noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const &; typedef R(T::* function_pointer_type)(Args..., ...) const & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const volatile & noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const volatile & noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const volatile &; typedef R(T::* function_pointer_type)(Args...) const volatile & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const volatile & noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const volatile & noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const volatile &; typedef R(T::* function_pointer_type)(Args..., ...) const volatile & noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) && noexcept , false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) && noexcept , false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) && ; typedef R(T::* function_pointer_type)(Args...) && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) && noexcept , false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) && noexcept , false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) && ; typedef R(T::* function_pointer_type)(Args..., ...) && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const && noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const && noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const &&; typedef R(T::* function_pointer_type)(Args...) const && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const && noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const && noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const &&; typedef R(T::* function_pointer_type)(Args..., ...) const && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args...) const volatile && noexcept, false> : basic_traits<true, false, T, R, Args...> { struct fx_traits<R(T::*)(Args...) const volatile && noexcept, false> : basic_traits<true, false, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args...) const volatile &&; typedef R(T::* function_pointer_type)(Args...) const volatile && noexcept;
}; };
template<typename T, typename R, typename... Args> template<typename T, typename R, typename... Args>
struct fx_traits<R(T::*)(Args..., ...) const volatile && noexcept, false> : basic_traits<true, true, T, R, Args...> { struct fx_traits<R(T::*)(Args..., ...) const volatile && noexcept, false> : basic_traits<true, true, T, R, Args...> {
typedef R(T::* function_pointer_type)(Args..., ...) const volatile &&; typedef R(T::* function_pointer_type)(Args..., ...) const volatile && noexcept;
}; };
#endif // noexcept is part of a function's type #endif // noexcept is part of a function's type

8
sol/call.hpp
View File

@ -239,6 +239,14 @@ namespace sol {
return f(L); return f(L);
} }
}; };
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE
template <bool is_index, bool is_variable, bool checked, int boost, typename C>
struct agnostic_lua_call_wrapper<detail::lua_CFunction_noexcept, is_index, is_variable, checked, boost, C> {
static int call(lua_State* L, detail::lua_CFunction_noexcept f) {
return f(L);
}
};
#endif // noexcept function types
template <bool is_index, bool is_variable, bool checked, int boost, typename C> template <bool is_index, bool is_variable, bool checked, int boost, typename C>
struct agnostic_lua_call_wrapper<no_prop, is_index, is_variable, checked, boost, C> { struct agnostic_lua_call_wrapper<no_prop, is_index, is_variable, checked, boost, C> {

1
sol/compatibility.hpp
View File

@ -27,6 +27,7 @@
// but has been modified in many places for use with Sol and luajit, // but has been modified in many places for use with Sol and luajit,
// though the core abstractions remain the same // though the core abstractions remain the same
#include "feature_test.hpp"
#include "compatibility/version.hpp" #include "compatibility/version.hpp"
#ifndef SOL_NO_COMPAT #ifndef SOL_NO_COMPAT

83
sol/compatibility/version.hpp
View File

@ -22,6 +22,8 @@
#ifndef SOL_VERSION_HPP #ifndef SOL_VERSION_HPP
#define SOL_VERSION_HPP #define SOL_VERSION_HPP
#include "../feature_test.hpp"
#ifdef SOL_USING_CXX_LUA #ifdef SOL_USING_CXX_LUA
#include <lua.h> #include <lua.h>
#include <lualib.h> #include <lualib.h>
@ -30,27 +32,6 @@
#include <lua.hpp> #include <lua.hpp>
#endif // C++ Mangling for Lua #endif // C++ Mangling for Lua
#if defined(__cpp_noexcept_function_type) && (__cpp_noexcept_function_type >= 201510L)
#ifndef SOL_NOEXCEPT_FUNCTION_TYPE
#define SOL_NOEXCEPT_FUNCTION_TYPE 1
#endif // noexcept is part of a function's type
#endif
#if defined(_WIN32) || defined(_MSC_VER)
#ifndef SOL_CODECVT_SUPPORT
#define SOL_CODECVT_SUPPORT 1
#endif // sol codecvt support
#elif defined(__GNUC__)
#if __GNUC__ >= 5
#ifndef SOL_CODECVT_SUPPORT
#define SOL_CODECVT_SUPPORT 1
#endif // codecvt support
#endif // g++ 5.x.x (MinGW too)
#else
// Clang sucks and doesn't really utilize codecvt support,
// not without checking the library versions explicitly (and we're not gonna do that, so fuck you)
#endif // Windows/VC++ vs. g++ vs Others
#ifdef LUAJIT_VERSION #ifdef LUAJIT_VERSION
#ifndef SOL_LUAJIT #ifndef SOL_LUAJIT
#define SOL_LUAJIT #define SOL_LUAJIT
@ -70,64 +51,4 @@
#define SOL_LUA_VERSION 502 #define SOL_LUA_VERSION 502
#endif // Lua Version 502, 501 || luajit, 500 #endif // Lua Version 502, 501 || luajit, 500
#ifdef _MSC_VER
#ifdef _DEBUG
#ifndef NDEBUG
#ifndef SOL_CHECK_ARGUMENTS
// Do not define by default: let user turn it on
//#define SOL_CHECK_ARGUMENTS
#endif // Check Arguments
#ifndef SOL_SAFE_USERTYPE
#define SOL_SAFE_USERTYPE
#endif // Safe Usertypes
#endif // NDEBUG
#endif // Debug
#ifndef _CPPUNWIND
#ifndef SOL_NO_EXCEPTIONS
#define SOL_NO_EXCEPTIONS 1
#endif
#endif // Automatic Exceptions
#ifndef _CPPRTTI
#ifndef SOL_NO_RTTI
#define SOL_NO_RTTI 1
#endif
#endif // Automatic RTTI
#elif defined(__GNUC__) || defined(__clang__)
#ifndef NDEBUG
#ifndef __OPTIMIZE__
#ifndef SOL_CHECK_ARGUMENTS
// Do not define by default: let user choose
//#define SOL_CHECK_ARGUMENTS
// But do check userdata by default:
#endif // Check Arguments
#ifndef SOL_SAFE_USERTYPE
#define SOL_SAFE_USERTYPE
#endif // Safe Usertypes
#endif // g++ optimizer flag
#endif // Not Debug
#ifndef __EXCEPTIONS
#ifndef SOL_NO_EXCEPTIONS
#define SOL_NO_EXCEPTIONS 1
#endif
#endif // No Exceptions
#ifndef __GXX_RTTI
#ifndef SOL_NO_RTII
#define SOL_NO_RTTI 1
#endif
#endif // No RTTI
#endif // vc++ || clang++/g++
#ifndef SOL_SAFE_USERTYPE
#ifdef SOL_CHECK_ARGUMENTS
#define SOL_SAFE_USERTYPE
#endif // Turn on Safety for all
#endif // Safe Usertypes
#endif // SOL_VERSION_HPP #endif // SOL_VERSION_HPP

18
sol/container_usertype_metatable.hpp
View File

@ -457,39 +457,39 @@ namespace sol {
} }
static int add_call(lua_State*L) { static int add_call(lua_State*L) {
return detail::static_trampoline<(&real_add_call)>(L); return detail::typed_static_trampoline<decltype(&real_add_call), &real_add_call>(L);
} }
static int insert_call(lua_State*L) { static int insert_call(lua_State*L) {
return detail::static_trampoline<(&real_insert_call)>(L); return detail::typed_static_trampoline<decltype(&real_insert_call), &real_insert_call>(L);
} }
static int clear_call(lua_State*L) { static int clear_call(lua_State*L) {
return detail::static_trampoline<(&real_clear_call)>(L); return detail::typed_static_trampoline<decltype(&real_clear_call), &real_clear_call>(L);
} }
static int find_call(lua_State*L) { static int find_call(lua_State*L) {
return detail::static_trampoline<(&real_find_call)>(L); return detail::typed_static_trampoline<decltype(&real_find_call), &real_find_call>(L);
} }
static int length_call(lua_State*L) { static int length_call(lua_State*L) {
return detail::static_trampoline<(&real_length_call)>(L); return detail::typed_static_trampoline<decltype(&real_length_call), &real_length_call>(L);
} }
static int pairs_next_call(lua_State*L) { static int pairs_next_call(lua_State*L) {
return detail::static_trampoline<(&real_pairs_next_call)>(L); return detail::typed_static_trampoline<decltype(&real_pairs_next_call), &real_pairs_next_call>(L);
} }
static int pairs_call(lua_State*L) { static int pairs_call(lua_State*L) {
return detail::static_trampoline<(&real_pairs_call)>(L); return detail::typed_static_trampoline<decltype(&real_pairs_call), &real_pairs_call>(L);
} }
static int index_call(lua_State*L) { static int index_call(lua_State*L) {
return detail::static_trampoline<(&real_index_call)>(L); return detail::typed_static_trampoline<decltype(&real_index_call), &real_index_call>(L);
} }
static int new_index_call(lua_State*L) { static int new_index_call(lua_State*L) {
return detail::static_trampoline<(&real_new_index_call)>(L); return detail::typed_static_trampoline<decltype(&real_new_index_call), &real_new_index_call>(L);
} }
}; };

106
sol/feature_test.hpp Normal file
View File

@ -0,0 +1,106 @@
// The MIT License (MIT)
// Copyright (c) 2013-2017 Rapptz, ThePhD and contributors
// Permission is hereby granted, free of charge, to any person obtaining a copy of
// this software and associated documentation files (the "Software"), to deal in
// the Software without restriction, including without limitation the rights to
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
// the Software, and to permit persons to whom the Software is furnished to do so,
// subject to the following conditions:
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef SOL_FEATURE_TEST_HPP
#define SOL_FEATURE_TEST_HPP
#if defined(__cpp_noexcept_function_type)
#ifndef SOL_NOEXCEPT_FUNCTION_TYPE
#define SOL_NOEXCEPT_FUNCTION_TYPE 1
#endif // noexcept is part of a function's type
#endif
#if defined(_WIN32) || defined(_MSC_VER)
#ifndef SOL_CODECVT_SUPPORT
#define SOL_CODECVT_SUPPORT 1
#endif // sol codecvt support
#elif defined(__GNUC__)
#if __GNUC__ >= 5
#ifndef SOL_CODECVT_SUPPORT
#define SOL_CODECVT_SUPPORT 1
#endif // codecvt support
#endif // g++ 5.x.x (MinGW too)
#else
// Clang sucks and doesn't really utilize codecvt support,
// not without checking the library versions explicitly (and we're not gonna do that, so fuck you)
#endif // Windows/VC++ vs. g++ vs Others
#ifdef _MSC_VER
#ifdef _DEBUG
#ifndef NDEBUG
#ifndef SOL_CHECK_ARGUMENTS
// Do not define by default: let user turn it on
//#define SOL_CHECK_ARGUMENTS
#endif // Check Arguments
#ifndef SOL_SAFE_USERTYPE
#define SOL_SAFE_USERTYPE
#endif // Safe Usertypes
#endif // NDEBUG
#endif // Debug
#ifndef _CPPUNWIND
#ifndef SOL_NO_EXCEPTIONS
#define SOL_NO_EXCEPTIONS 1
#endif
#endif // Automatic Exceptions
#ifndef _CPPRTTI
#ifndef SOL_NO_RTTI
#define SOL_NO_RTTI 1
#endif
#endif // Automatic RTTI
#elif defined(__GNUC__) || defined(__clang__)
#ifndef NDEBUG
#ifndef __OPTIMIZE__
#ifndef SOL_CHECK_ARGUMENTS
// Do not define by default: let user choose
//#define SOL_CHECK_ARGUMENTS
// But do check userdata by default:
#endif // Check Arguments
#ifndef SOL_SAFE_USERTYPE
#define SOL_SAFE_USERTYPE
#endif // Safe Usertypes
#endif // g++ optimizer flag
#endif // Not Debug
#ifndef __EXCEPTIONS
#ifndef SOL_NO_EXCEPTIONS
#define SOL_NO_EXCEPTIONS 1
#endif
#endif // No Exceptions
#ifndef __GXX_RTTI
#ifndef SOL_NO_RTII
#define SOL_NO_RTTI 1
#endif
#endif // No RTTI
#endif // vc++ || clang++/g++
#ifndef SOL_SAFE_USERTYPE
#ifdef SOL_CHECK_ARGUMENTS
#define SOL_SAFE_USERTYPE
#endif // Turn on Safety for all
#endif // Safe Usertypes
#endif // SOL_FEATURE_TEST_HPP

31
sol/function_types_stateless.hpp
View File

@ -29,16 +29,16 @@ namespace sol {
template<typename Function> template<typename Function>
struct upvalue_free_function { struct upvalue_free_function {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef meta::bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L); auto udata = stack::stack_detail::get_as_upvalues<function_type*>(L);
function_type* fx = udata.first; function_type* fx = udata.first;
return call_detail::call_wrapped<void, true, false>(L, fx); return call_detail::call_wrapped<void, true, false>(L, fx);
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -51,7 +51,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
// Layout: // Layout:
// idx 1...n: verbatim data of member function pointer // idx 1...n: verbatim data of member function pointer
// idx n + 1: is the object's void pointer // idx n + 1: is the object's void pointer
@ -65,7 +65,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -78,7 +78,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
// idx n + 1: is the object's void pointer // idx n + 1: is the object's void pointer
@ -99,7 +99,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -112,7 +112,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
// idx n + 1: is the object's void pointer // idx n + 1: is the object's void pointer
@ -131,7 +131,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -144,7 +144,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(traits_type::is_noexcept) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L); auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
@ -153,7 +153,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -164,9 +164,8 @@ namespace sol {
template<typename T, typename Function> template<typename T, typename Function>
struct upvalue_this_member_variable { struct upvalue_this_member_variable {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(false) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L); auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
@ -182,7 +181,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {
@ -195,7 +194,7 @@ namespace sol {
typedef std::remove_pointer_t<std::decay_t<Function>> function_type; typedef std::remove_pointer_t<std::decay_t<Function>> function_type;
typedef lua_bind_traits<function_type> traits_type; typedef lua_bind_traits<function_type> traits_type;
static int real_call(lua_State* L) { static int real_call(lua_State* L) noexcept(false) {
// Layout: // Layout:
// idx 1...n: verbatim data of member variable pointer // idx 1...n: verbatim data of member variable pointer
auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L); auto memberdata = stack::stack_detail::get_as_upvalues<function_type>(L);
@ -209,7 +208,7 @@ namespace sol {
} }
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call)>(L); return detail::typed_static_trampoline<decltype(&real_call), &real_call>(L);
} }
int operator()(lua_State* L) { int operator()(lua_State* L) {

12
sol/function_types_templated.hpp
View File

@ -99,15 +99,7 @@ namespace sol {
template <typename F, F fx> template <typename F, F fx>
inline int c_call_raw(std::true_type, lua_State* L) { inline int c_call_raw(std::true_type, lua_State* L) {
#ifdef __clang__ return fx(L);
return detail::trampoline(L, fx);
#else
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE
return meta::bind_traits<F>::is_noexcept ? detail::static_trampoline_noexcept<fx>(L) : detail::static_trampoline<fx>(L);
#else
return detail::static_trampoline<fx>(L);
#endif
#endif // fuck you clang :c
} }
template <typename F, F fx> template <typename F, F fx>
@ -115,7 +107,7 @@ namespace sol {
#ifdef __clang__ #ifdef __clang__
return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>); return detail::trampoline(L, function_detail::call_wrapper_entry<F, fx>);
#else #else
return detail::static_trampoline<(&function_detail::call_wrapper_entry<F, fx>)>(L); return detail::typed_static_trampoline<decltype(&function_detail::call_wrapper_entry<F, fx>), &function_detail::call_wrapper_entry<F, fx>>(L);
#endif // fuck you clang :c #endif // fuck you clang :c
} }

4
sol/simple_usertype_metatable.hpp
View File

@ -152,7 +152,7 @@ namespace sol {
#if defined(__clang__) #if defined(__clang__)
return detail::trampoline(L, &simple_real_index_call<T, has_indexing>); return detail::trampoline(L, &simple_real_index_call<T, has_indexing>);
#else #else
return detail::static_trampoline<(&simple_real_index_call<T, has_indexing>)>(L); return detail::typed_static_trampoline<decltype(&simple_real_index_call<T, has_indexing>), (&simple_real_index_call<T, has_indexing>)>(L);
#endif #endif
} }
@ -161,7 +161,7 @@ namespace sol {
#if defined(__clang__) #if defined(__clang__)
return detail::trampoline(L, &simple_real_new_index_call<T, has_indexing>); return detail::trampoline(L, &simple_real_new_index_call<T, has_indexing>);
#else #else
return detail::static_trampoline<(&simple_real_new_index_call<T, has_indexing>)>(L); return detail::typed_static_trampoline<decltype(&simple_real_new_index_call<T, has_indexing>), (&simple_real_new_index_call<T, has_indexing>)>(L);
#endif #endif
} }
} }

30
sol/types.hpp
View File

@ -41,6 +41,13 @@ namespace sol {
return f(L); return f(L);
} }
#ifdef SOL_NOEXCEPT_FUNCTION_TYPE
template <lua_CFunction_noexcept f>
int static_trampoline_noexcept(lua_State* L) noexcept {
return f(L);
}
#endif
template <typename Fx, typename... Args> template <typename Fx, typename... Args>
int trampoline(lua_State* L, Fx&& f, Args&&... args) noexcept { int trampoline(lua_State* L, Fx&& f, Args&&... args) noexcept {
return f(L, std::forward<Args>(args)...); return f(L, std::forward<Args>(args)...);
@ -79,7 +86,12 @@ namespace sol {
template <lua_CFunction_noexcept f> template <lua_CFunction_noexcept f>
int static_trampoline_noexcept(lua_State* L) noexcept { int static_trampoline_noexcept(lua_State* L) noexcept {
#endif // impossible #endif // impossible
std::cout << "[STATIC_TRAMPOLINE] HEY A NOEXCEPTION FUNCTION IS GONNA BE CALLED" << std::endl; return f(L);
}
#else
template <lua_CFunction f>
int static_trampoline_noexcept(lua_State* L) noexcept {
return f(L); return f(L);
} }
#endif // noexcept lua_CFunction type #endif // noexcept lua_CFunction type
@ -87,7 +99,6 @@ namespace sol {
template <typename Fx, typename... Args> template <typename Fx, typename... Args>
int trampoline(lua_State* L, Fx&& f, Args&&... args) { int trampoline(lua_State* L, Fx&& f, Args&&... args) {
if (meta::bind_traits<meta::unqualified_t<Fx>>::is_noexcept) { if (meta::bind_traits<meta::unqualified_t<Fx>>::is_noexcept) {
std::cout << "[TRAMPOLINE] HEY A NOEXCEPTION FUNCTION IS GONNA BE CALLED" << std::endl;
return f(L, std::forward<Args>(args)...); return f(L, std::forward<Args>(args)...);
} }
try { try {
@ -112,6 +123,21 @@ namespace sol {
} }
#endif // Exceptions vs. No Exceptions #endif // Exceptions vs. No Exceptions
template <typename F, F fx>
inline int typed_static_trampoline_raw(std::true_type, lua_State* L) {
return static_trampoline_noexcept<fx>(L);
}
template <typename F, F fx>
inline int typed_static_trampoline_raw(std::false_type, lua_State* L) {
return static_trampoline<fx>(L);
}
template <typename F, F fx>
inline int typed_static_trampoline(lua_State* L) {
return typed_static_trampoline_raw<F, fx>(std::integral_constant<bool, meta::bind_traits<F>::is_noexcept>(), L);
}
template <typename T> template <typename T>
struct unique_usertype {}; struct unique_usertype {};

8
sol/usertype_metatable.hpp
View File

@ -673,20 +673,20 @@ namespace sol {
template <std::size_t Idx, bool is_index = true, bool is_variable = false> template <std::size_t Idx, bool is_index = true, bool is_variable = false>
static int call(lua_State* L) { static int call(lua_State* L) {
return detail::static_trampoline<(&real_call<Idx, is_index, is_variable>)>(L); return detail::typed_static_trampoline<decltype(&real_call<Idx, is_index, is_variable>), (&real_call<Idx, is_index, is_variable>)>(L);
} }
template <std::size_t Idx, bool is_index = true, bool is_variable = false> template <std::size_t Idx, bool is_index = true, bool is_variable = false>
static int call_with(lua_State* L) { static int call_with(lua_State* L) {
return detail::static_trampoline<(&real_call_with<Idx, is_index, is_variable>)>(L); return detail::typed_static_trampoline<decltype(&real_call_with<Idx, is_index, is_variable>), (&real_call_with<Idx, is_index, is_variable>)>(L);
} }
static int index_call(lua_State* L) { static int index_call(lua_State* L) {
return detail::static_trampoline<(&real_index_call)>(L); return detail::typed_static_trampoline<decltype(&real_index_call), (&real_index_call)>(L);
} }
static int new_index_call(lua_State* L) { static int new_index_call(lua_State* L) {
return detail::static_trampoline<(&real_new_index_call)>(L); return detail::typed_static_trampoline<decltype(&real_new_index_call), (&real_new_index_call)>(L);
} }
virtual int push_um(lua_State* L) override { virtual int push_um(lua_State* L) override {

8
sol/wrapper.hpp
View File

@ -28,7 +28,7 @@ namespace sol {
template <typename F, typename = void> template <typename F, typename = void>
struct wrapper { struct wrapper {
typedef lua_bind_traits<F> traits_type; typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
typedef typename traits_type::args_list args_list; typedef typename traits_type::args_list args_list;
typedef typename traits_type::args_list free_args_list; typedef typename traits_type::args_list free_args_list;
typedef typename traits_type::returns_list returns_list; typedef typename traits_type::returns_list returns_list;
@ -47,8 +47,8 @@ namespace sol {
}; };
template <typename F> template <typename F>
struct wrapper<F, std::enable_if_t<std::is_function<meta::unqualified_t<std::remove_pointer_t<F>>>::value>> { struct wrapper<F, std::enable_if_t<std::is_function<std::remove_pointer_t<meta::unqualified_t<F>>>::value>> {
typedef lua_bind_traits<F> traits_type; typedef lua_bind_traits<std::remove_pointer_t<meta::unqualified_t<F>>> traits_type;
typedef typename traits_type::args_list args_list; typedef typename traits_type::args_list args_list;
typedef typename traits_type::args_list free_args_list; typedef typename traits_type::args_list free_args_list;
typedef typename traits_type::returns_list returns_list; typedef typename traits_type::returns_list returns_list;
@ -81,7 +81,7 @@ namespace sol {
template <typename F> template <typename F>
struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> { struct wrapper<F, std::enable_if_t<std::is_member_object_pointer<meta::unqualified_t<F>>::value>> {
typedef lua_bind_traits<F> traits_type; typedef lua_bind_traits<meta::unqualified_t<F>> traits_type;
typedef typename traits_type::object_type object_type; typedef typename traits_type::object_type object_type;
typedef typename traits_type::return_type return_type; typedef typename traits_type::return_type return_type;
typedef typename traits_type::args_list args_list; typedef typename traits_type::args_list args_list;