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

Found the problem.

Browse Source
This commit is contained in:
ThePhD 2020-01-25 00:13:08 -05:00
parent c5863c8c31
commit 2beb13b9b2
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
4 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/source/customization_base_object_catch.cpp
View File

@ -1,7 +1,5 @@
#define SOL_ALL_SAFETIES_ON 1
#include <sol/sol.hpp> #include <sol/sol.hpp>
#include <iostream> #include <iostream>
#include <exception>
// We capture the base objects // We capture the base objects
// lifetime style // lifetime style

58
include/sol/stack_push.hpp
View File

@ -119,7 +119,7 @@ namespace sol { namespace stack {
// just the sizeof(T*), and nothing else. // just the sizeof(T*), and nothing else.
T* obj = detail::usertype_allocate<T>(L); T* obj = detail::usertype_allocate<T>(L);
f(); f();
std::allocator<T> alloc{}; std::allocator<T> alloc {};
std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...); std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...);
return 1; return 1;
} }
@ -189,16 +189,6 @@ namespace sol { namespace stack {
} }
}; };
template <typename T>
struct unqualified_pusher<detail::as_unique_tag<T>> {
template <typename... Args>
static int push (lua_State* L, Args&&... args) {
stack_detail::uu_pusher<T> p;
(void)p;
return p.push(L, std::forward<Args>(args)...);
}
};
namespace stack_detail { namespace stack_detail {
template <typename T> template <typename T>
struct uu_pusher { struct uu_pusher {
@ -229,7 +219,7 @@ namespace sol { namespace stack {
detail::unique_tag* id = nullptr; detail::unique_tag* id = nullptr;
Real* mem = detail::usertype_unique_allocate<P, Real>(L, pref, fx, id); Real* mem = detail::usertype_unique_allocate<P, Real>(L, pref, fx, id);
if (luaL_newmetatable(L, &usertype_traits<detail::unique_usertype<std::remove_cv_t<P>>>::metatable()[0]) == 1) { if (luaL_newmetatable(L, &usertype_traits<detail::unique_usertype<std::remove_cv_t<P>>>::metatable()[0]) == 1) {
detail::lua_reg_table l{}; detail::lua_reg_table l {};
int index = 0; int index = 0;
detail::indexed_insert insert_fx(l, index); detail::indexed_insert insert_fx(l, index);
detail::insert_default_registrations<P>(insert_fx, detail::property_always_true); detail::insert_default_registrations<P>(insert_fx, detail::property_always_true);
@ -246,6 +236,16 @@ namespace sol { namespace stack {
}; };
} // namespace stack_detail } // namespace stack_detail
template <typename T>
struct unqualified_pusher<detail::as_unique_tag<T>> {
template <typename... Args>
static int push(lua_State* L, Args&&... args) {
stack_detail::uu_pusher<T> p;
(void)p;
return p.push(L, std::forward<Args>(args)...);
}
};
template <typename T, typename> template <typename T, typename>
struct unqualified_pusher { struct unqualified_pusher {
template <typename... Args> template <typename... Args>
@ -253,7 +253,7 @@ namespace sol { namespace stack {
using Tu = meta::unqualified_t<T>; using Tu = meta::unqualified_t<T>;
if constexpr (is_lua_reference_v<Tu>) { if constexpr (is_lua_reference_v<Tu>) {
using int_arr = int[]; using int_arr = int[];
int_arr p{ (std::forward<Args>(args).push(L))... }; int_arr p { (std::forward<Args>(args).push(L))... };
return p[0]; return p[0];
} }
else if constexpr (std::is_same_v<Tu, bool>) { else if constexpr (std::is_same_v<Tu, bool>) {
@ -428,7 +428,7 @@ namespace sol { namespace stack {
template <typename T> template <typename T>
struct unqualified_pusher<std::initializer_list<T>> { struct unqualified_pusher<std::initializer_list<T>> {
static int push(lua_State* L, const std::initializer_list<T>& il) { static int push(lua_State* L, const std::initializer_list<T>& il) {
unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p{}; unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p {};
// silence annoying VC++ warning // silence annoying VC++ warning
(void)p; (void)p;
return p.push(L, il); return p.push(L, il);
@ -601,7 +601,7 @@ namespace sol { namespace stack {
} }
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
} }
std::allocator<T> alloc{}; std::allocator<T> alloc {};
std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...); std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...);
return 1; return 1;
} }
@ -684,25 +684,25 @@ namespace sol { namespace stack {
template <> template <>
struct unqualified_pusher<char*> { struct unqualified_pusher<char*> {
static int push_sized(lua_State* L, const char* str, std::size_t len) { static int push_sized(lua_State* L, const char* str, std::size_t len) {
unqualified_pusher<const char*> p{}; unqualified_pusher<const char*> p {};
(void)p; (void)p;
return p.push_sized(L, str, len); return p.push_sized(L, str, len);
} }
static int push(lua_State* L, const char* str) { static int push(lua_State* L, const char* str) {
unqualified_pusher<const char*> p{}; unqualified_pusher<const char*> p {};
(void)p; (void)p;
return p.push(L, str); return p.push(L, str);
} }
static int push(lua_State* L, const char* strb, const char* stre) { static int push(lua_State* L, const char* strb, const char* stre) {
unqualified_pusher<const char*> p{}; unqualified_pusher<const char*> p {};
(void)p; (void)p;
return p.push(L, strb, stre); return p.push(L, strb, stre);
} }
static int push(lua_State* L, const char* str, std::size_t len) { static int push(lua_State* L, const char* str, std::size_t len) {
unqualified_pusher<const char*> p{}; unqualified_pusher<const char*> p {};
(void)p; (void)p;
return p.push(L, str, len); return p.push(L, str, len);
} }
@ -847,19 +847,19 @@ namespace sol { namespace stack {
template <> template <>
struct unqualified_pusher<wchar_t*> { struct unqualified_pusher<wchar_t*> {
static int push(lua_State* L, const wchar_t* str) { static int push(lua_State* L, const wchar_t* str) {
unqualified_pusher<const wchar_t*> p{}; unqualified_pusher<const wchar_t*> p {};
(void)p; (void)p;
return p.push(L, str); return p.push(L, str);
} }
static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) { static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
unqualified_pusher<const wchar_t*> p{}; unqualified_pusher<const wchar_t*> p {};
(void)p; (void)p;
return p.push(L, strb, stre); return p.push(L, strb, stre);
} }
static int push(lua_State* L, const wchar_t* str, std::size_t len) { static int push(lua_State* L, const wchar_t* str, std::size_t len) {
unqualified_pusher<const wchar_t*> p{}; unqualified_pusher<const wchar_t*> p {};
(void)p; (void)p;
return p.push(L, str, len); return p.push(L, str, len);
} }
@ -925,19 +925,19 @@ namespace sol { namespace stack {
template <> template <>
struct unqualified_pusher<char16_t*> { struct unqualified_pusher<char16_t*> {
static int push(lua_State* L, const char16_t* str) { static int push(lua_State* L, const char16_t* str) {
unqualified_pusher<const char16_t*> p{}; unqualified_pusher<const char16_t*> p {};
(void)p; (void)p;
return p.push(L, str); return p.push(L, str);
} }
static int push(lua_State* L, const char16_t* strb, const char16_t* stre) { static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
unqualified_pusher<const char16_t*> p{}; unqualified_pusher<const char16_t*> p {};
(void)p; (void)p;
return p.push(L, strb, stre); return p.push(L, strb, stre);
} }
static int push(lua_State* L, const char16_t* str, std::size_t len) { static int push(lua_State* L, const char16_t* str, std::size_t len) {
unqualified_pusher<const char16_t*> p{}; unqualified_pusher<const char16_t*> p {};
(void)p; (void)p;
return p.push(L, str, len); return p.push(L, str, len);
} }
@ -1002,19 +1002,19 @@ namespace sol { namespace stack {
template <> template <>
struct unqualified_pusher<char32_t*> { struct unqualified_pusher<char32_t*> {
static int push(lua_State* L, const char32_t* str) { static int push(lua_State* L, const char32_t* str) {
unqualified_pusher<const char32_t*> p{}; unqualified_pusher<const char32_t*> p {};
(void)p; (void)p;
return p.push(L, str); return p.push(L, str);
} }
static int push(lua_State* L, const char32_t* strb, const char32_t* stre) { static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
unqualified_pusher<const char32_t*> p{}; unqualified_pusher<const char32_t*> p {};
(void)p; (void)p;
return p.push(L, strb, stre); return p.push(L, strb, stre);
} }
static int push(lua_State* L, const char32_t* str, std::size_t len) { static int push(lua_State* L, const char32_t* str, std::size_t len) {
unqualified_pusher<const char32_t*> p{}; unqualified_pusher<const char32_t*> p {};
(void)p; (void)p;
return p.push(L, str, len); return p.push(L, str, len);
} }
@ -1085,7 +1085,7 @@ namespace sol { namespace stack {
luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic); luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic);
#endif // make sure stack doesn't overflow #endif // make sure stack doesn't overflow
int pushcount = 0; int pushcount = 0;
(void)detail::swallow{ 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... }; (void)detail::swallow { 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... };
return pushcount; return pushcount;
} }

4
single/include/sol/forward.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 2020-01-25 01:16:25.945664 UTC // Generated 2020-01-25 04:59:37.808053 UTC
// This header was generated with sol v3.2.0 (revision 5301bc1) // This header was generated with sol v3.2.0 (revision c5863c8)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP #ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP

62
single/include/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 2020-01-25 01:16:25.151902 UTC // Generated 2020-01-25 04:59:35.996014 UTC
// This header was generated with sol v3.2.0 (revision 5301bc1) // This header was generated with sol v3.2.0 (revision c5863c8)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -13206,7 +13206,7 @@ namespace sol { namespace stack {
// just the sizeof(T*), and nothing else. // just the sizeof(T*), and nothing else.
T* obj = detail::usertype_allocate<T>(L); T* obj = detail::usertype_allocate<T>(L);
f(); f();
std::allocator<T> alloc{}; std::allocator<T> alloc {};
std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...); std::allocator_traits<std::allocator<T>>::construct(alloc, obj, std::forward<Args>(args)...);
return 1; return 1;
} }
@ -13276,16 +13276,6 @@ namespace sol { namespace stack {
} }
}; };
template <typename T>
struct unqualified_pusher<detail::as_unique_tag<T>> {
template <typename... Args>
static int push (lua_State* L, Args&&... args) {
stack_detail::uu_pusher<T> p;
(void)p;
return p.push(L, std::forward<Args>(args)...);
}
};
namespace stack_detail { namespace stack_detail {
template <typename T> template <typename T>
struct uu_pusher { struct uu_pusher {
@ -13316,7 +13306,7 @@ namespace sol { namespace stack {
detail::unique_tag* id = nullptr; detail::unique_tag* id = nullptr;
Real* mem = detail::usertype_unique_allocate<P, Real>(L, pref, fx, id); Real* mem = detail::usertype_unique_allocate<P, Real>(L, pref, fx, id);
if (luaL_newmetatable(L, &usertype_traits<detail::unique_usertype<std::remove_cv_t<P>>>::metatable()[0]) == 1) { if (luaL_newmetatable(L, &usertype_traits<detail::unique_usertype<std::remove_cv_t<P>>>::metatable()[0]) == 1) {
detail::lua_reg_table l{}; detail::lua_reg_table l {};
int index = 0; int index = 0;
detail::indexed_insert insert_fx(l, index); detail::indexed_insert insert_fx(l, index);
detail::insert_default_registrations<P>(insert_fx, detail::property_always_true); detail::insert_default_registrations<P>(insert_fx, detail::property_always_true);
@ -13333,6 +13323,16 @@ namespace sol { namespace stack {
}; };
} // namespace stack_detail } // namespace stack_detail
template <typename T>
struct unqualified_pusher<detail::as_unique_tag<T>> {
template <typename... Args>
static int push(lua_State* L, Args&&... args) {
stack_detail::uu_pusher<T> p;
(void)p;
return p.push(L, std::forward<Args>(args)...);
}
};
template <typename T, typename> template <typename T, typename>
struct unqualified_pusher { struct unqualified_pusher {
template <typename... Args> template <typename... Args>
@ -13340,7 +13340,7 @@ namespace sol { namespace stack {
using Tu = meta::unqualified_t<T>; using Tu = meta::unqualified_t<T>;
if constexpr (is_lua_reference_v<Tu>) { if constexpr (is_lua_reference_v<Tu>) {
using int_arr = int[]; using int_arr = int[];
int_arr p{ (std::forward<Args>(args).push(L))... }; int_arr p { (std::forward<Args>(args).push(L))... };
return p[0]; return p[0];
} }
else if constexpr (std::is_same_v<Tu, bool>) { else if constexpr (std::is_same_v<Tu, bool>) {
@ -13515,7 +13515,7 @@ namespace sol { namespace stack {
template <typename T> template <typename T>
struct unqualified_pusher<std::initializer_list<T>> { struct unqualified_pusher<std::initializer_list<T>> {
static int push(lua_State* L, const std::initializer_list<T>& il) { static int push(lua_State* L, const std::initializer_list<T>& il) {
unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p{}; unqualified_pusher<detail::as_table_tag<std::initializer_list<T>>> p {};
// silence annoying VC++ warning // silence annoying VC++ warning
(void)p; (void)p;
return p.push(L, il); return p.push(L, il);
@ -13688,7 +13688,7 @@ namespace sol { namespace stack {
} }
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
} }
std::allocator<T> alloc{}; std::allocator<T> alloc {};
std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...); std::allocator_traits<std::allocator<T>>::construct(alloc, data, std::forward<Args>(args)...);
return 1; return 1;
} }
@ -13771,25 +13771,25 @@ namespace sol { namespace stack {
template <> template <>
struct unqualified_pusher<char*> { struct unqualified_pusher<char*> {
static int push_sized(lua_State* L, const char* str, std::size_t len) { static int push_sized(lua_State* L, const char* str, std::size_t len) {
unqualified_pusher<const char*> p{}; unqualified_pusher<const char*> p {};
(void)p; (void)p;
return p.push_sized(L, str, len); return p.push_sized(L, str, len);
} }
static int push(lua_State* L, const char* str) { static int push(lua_State* L, const char* str) {
unqualified_pusher<const char*> p{}; unqualified_pusher<const char*> p {};
(void)p; (void)p;
return p.push(L, str); return p.push(L, str);
} }
static int push(lua_State* L, const char* strb, const char* stre) { static int push(lua_State* L, const char* strb, const char* stre) {
unqualified_pusher<const char*> p{}; unqualified_pusher<const char*> p {};
(void)p; (void)p;
return p.push(L, strb, stre); return p.push(L, strb, stre);
} }
static int push(lua_State* L, const char* str, std::size_t len) { static int push(lua_State* L, const char* str, std::size_t len) {
unqualified_pusher<const char*> p{}; unqualified_pusher<const char*> p {};
(void)p; (void)p;
return p.push(L, str, len); return p.push(L, str, len);
} }
@ -13934,19 +13934,19 @@ namespace sol { namespace stack {
template <> template <>
struct unqualified_pusher<wchar_t*> { struct unqualified_pusher<wchar_t*> {
static int push(lua_State* L, const wchar_t* str) { static int push(lua_State* L, const wchar_t* str) {
unqualified_pusher<const wchar_t*> p{}; unqualified_pusher<const wchar_t*> p {};
(void)p; (void)p;
return p.push(L, str); return p.push(L, str);
} }
static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) { static int push(lua_State* L, const wchar_t* strb, const wchar_t* stre) {
unqualified_pusher<const wchar_t*> p{}; unqualified_pusher<const wchar_t*> p {};
(void)p; (void)p;
return p.push(L, strb, stre); return p.push(L, strb, stre);
} }
static int push(lua_State* L, const wchar_t* str, std::size_t len) { static int push(lua_State* L, const wchar_t* str, std::size_t len) {
unqualified_pusher<const wchar_t*> p{}; unqualified_pusher<const wchar_t*> p {};
(void)p; (void)p;
return p.push(L, str, len); return p.push(L, str, len);
} }
@ -14012,19 +14012,19 @@ namespace sol { namespace stack {
template <> template <>
struct unqualified_pusher<char16_t*> { struct unqualified_pusher<char16_t*> {
static int push(lua_State* L, const char16_t* str) { static int push(lua_State* L, const char16_t* str) {
unqualified_pusher<const char16_t*> p{}; unqualified_pusher<const char16_t*> p {};
(void)p; (void)p;
return p.push(L, str); return p.push(L, str);
} }
static int push(lua_State* L, const char16_t* strb, const char16_t* stre) { static int push(lua_State* L, const char16_t* strb, const char16_t* stre) {
unqualified_pusher<const char16_t*> p{}; unqualified_pusher<const char16_t*> p {};
(void)p; (void)p;
return p.push(L, strb, stre); return p.push(L, strb, stre);
} }
static int push(lua_State* L, const char16_t* str, std::size_t len) { static int push(lua_State* L, const char16_t* str, std::size_t len) {
unqualified_pusher<const char16_t*> p{}; unqualified_pusher<const char16_t*> p {};
(void)p; (void)p;
return p.push(L, str, len); return p.push(L, str, len);
} }
@ -14089,19 +14089,19 @@ namespace sol { namespace stack {
template <> template <>
struct unqualified_pusher<char32_t*> { struct unqualified_pusher<char32_t*> {
static int push(lua_State* L, const char32_t* str) { static int push(lua_State* L, const char32_t* str) {
unqualified_pusher<const char32_t*> p{}; unqualified_pusher<const char32_t*> p {};
(void)p; (void)p;
return p.push(L, str); return p.push(L, str);
} }
static int push(lua_State* L, const char32_t* strb, const char32_t* stre) { static int push(lua_State* L, const char32_t* strb, const char32_t* stre) {
unqualified_pusher<const char32_t*> p{}; unqualified_pusher<const char32_t*> p {};
(void)p; (void)p;
return p.push(L, strb, stre); return p.push(L, strb, stre);
} }
static int push(lua_State* L, const char32_t* str, std::size_t len) { static int push(lua_State* L, const char32_t* str, std::size_t len) {
unqualified_pusher<const char32_t*> p{}; unqualified_pusher<const char32_t*> p {};
(void)p; (void)p;
return p.push(L, str, len); return p.push(L, str, len);
} }
@ -14172,7 +14172,7 @@ namespace sol { namespace stack {
luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic); luaL_checkstack(L, static_cast<int>(sizeof...(I)), detail::not_enough_stack_space_generic);
#endif // make sure stack doesn't overflow #endif // make sure stack doesn't overflow
int pushcount = 0; int pushcount = 0;
(void)detail::swallow{ 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... }; (void)detail::swallow { 0, (pushcount += stack::push(L, std::get<I>(std::forward<T>(t))), 0)... };
return pushcount; return pushcount;
} }