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

MSVC is an ass and will probably continue to be an ass for a while to come.

Browse Source
This commit is contained in:
ThePhD 2018-03-17 09:09:37 -04:00
parent 947945d098
commit d14345f016
4 changed files with 96 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
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 2018-03-12 00:06:06.950598 UTC // Generated 2018-03-17 13:09:07.758298 UTC
// This header was generated with sol v2.19.5 (revision 22ecb74) // This header was generated with sol v2.19.5 (revision 947945d)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_HPP #ifndef SOL_SINGLE_INCLUDE_HPP
@ -1688,7 +1688,7 @@ namespace sol {
namespace meta_detail { namespace meta_detail {
template <typename T, meta::disable<meta::is_specialization_of<meta::unqualified_t<T>, std::tuple>> = meta::enabler> template <typename T, meta::disable<meta::is_specialization_of<meta::unqualified_t<T>, std::tuple>> = meta::enabler>
decltype(auto) force_tuple(T&& x) { decltype(auto) force_tuple(T&& x) {
return std::forward_as_tuple(std::forward<T>(x)); return std::tuple<std::decay_t<T>>(std::forward<T>(x));
} }
template <typename T, meta::enable<meta::is_specialization_of<meta::unqualified_t<T>, std::tuple>> = meta::enabler> template <typename T, meta::enable<meta::is_specialization_of<meta::unqualified_t<T>, std::tuple>> = meta::enabler>
@ -12560,13 +12560,9 @@ namespace sol {
construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj), L, argcount, 1 + static_cast<int>(syntax)); construct_match<T, TypeLists...>(constructor_match<T, checked, clean_stack>(obj), L, argcount, 1 + static_cast<int>(syntax));
userdataref.push(); userdataref.push();
luaL_getmetatable(L, &meta[0]); stack::stack_detail::undefined_metatable<T> umf(L, &meta[0]);
if (type_of(L, -1) == type::lua_nil) { umf();
lua_pop(L, 1);
return luaL_error(L, "sol: unable to get usertype metatable");
}
lua_setmetatable(L, -2);
return 1; return 1;
} }
@ -12847,7 +12843,7 @@ namespace sol {
typedef constructor_list<Args...> F; typedef constructor_list<Args...> F;
static int call(lua_State* L, F&) { static int call(lua_State* L, F&) {
const auto& metakey = usertype_traits<T>::metatable(); const auto& meta = usertype_traits<T>::metatable();
int argcount = lua_gettop(L); int argcount = lua_gettop(L);
call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot; call_syntax syntax = argcount > 0 ? stack::get_call_syntax(L, usertype_traits<T>::user_metatable(), 1) : call_syntax::dot;
argcount -= static_cast<int>(syntax); argcount -= static_cast<int>(syntax);
@ -12858,13 +12854,9 @@ namespace sol {
construct_match<T, Args...>(constructor_match<T, false, clean_stack>(obj), L, argcount, boost + 1 + static_cast<int>(syntax)); construct_match<T, Args...>(constructor_match<T, false, clean_stack>(obj), L, argcount, boost + 1 + static_cast<int>(syntax));
userdataref.push(); userdataref.push();
luaL_getmetatable(L, &metakey[0]); stack::stack_detail::undefined_metatable<T> umf(L, &meta[0]);
if (type_of(L, -1) == type::lua_nil) { umf();
lua_pop(L, 1);
return luaL_error(L, "sol: unable to get usertype metatable");
}
lua_setmetatable(L, -2);
return 1; return 1;
} }
}; };
@ -12876,7 +12868,7 @@ namespace sol {
struct onmatch { struct onmatch {
template <typename Fx, std::size_t I, typename... R, typename... Args> template <typename Fx, std::size_t I, typename... R, typename... Args>
int operator()(types<Fx>, index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start, F& f) { int operator()(types<Fx>, index_value<I>, types<R...> r, types<Args...> a, lua_State* L, int, int start, F& f) {
const auto& metakey = usertype_traits<T>::metatable(); const auto& meta = usertype_traits<T>::metatable();
T* obj = detail::usertype_allocate<T>(L); T* obj = detail::usertype_allocate<T>(L);
reference userdataref(L, -1); reference userdataref(L, -1);
@ -12884,14 +12876,8 @@ namespace sol {
stack::call_into_lua<checked, clean_stack>(r, a, L, boost + start, func, detail::implicit_wrapper<T>(obj)); stack::call_into_lua<checked, clean_stack>(r, a, L, boost + start, func, detail::implicit_wrapper<T>(obj));
userdataref.push(); userdataref.push();
luaL_getmetatable(L, &metakey[0]); stack::stack_detail::undefined_metatable<T> umf(L, &meta[0]);
if (type_of(L, -1) == type::lua_nil) { umf();
lua_pop(L, 1);
std::string err = "sol: unable to get usertype metatable for ";
err += usertype_traits<T>::name();
return luaL_error(L, err.c_str());
}
lua_setmetatable(L, -2);
return 1; return 1;
} }
@ -12918,11 +12904,25 @@ namespace sol {
struct lua_call_wrapper<T, destructor_wrapper<Fx>, is_index, is_variable, checked, boost, clean_stack, std::enable_if_t<!std::is_void<Fx>::value>> { struct lua_call_wrapper<T, destructor_wrapper<Fx>, is_index, is_variable, checked, boost, clean_stack, std::enable_if_t<!std::is_void<Fx>::value>> {
typedef destructor_wrapper<Fx> F; typedef destructor_wrapper<Fx> F;
static int call(lua_State* L, const F& f) { static int call_void(std::true_type, lua_State* L, const F& f) {
typedef meta::bind_traits<meta::unqualified_t<decltype(f.fx)>> bt;
typedef typename bt::template arg_at<0> arg0;
typedef meta::unqualified_t<arg0> O;
O& obj = stack::get<O>(L);
f.fx(detail::implicit_wrapper<O>(obj));
return 0;
}
static int call_void(std::false_type, lua_State* L, const F& f) {
T& obj = stack::get<T>(L); T& obj = stack::get<T>(L);
f.fx(detail::implicit_wrapper<T>(obj)); f.fx(detail::implicit_wrapper<T>(obj));
return 0; return 0;
} }
static int call(lua_State* L, const F& f) {
return call_void(std::is_void<T>(), L, f);
}
}; };
template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C> template <typename T, typename... Fs, bool is_index, bool is_variable, bool checked, int boost, bool clean_stack, typename C>
@ -14153,6 +14153,20 @@ namespace sol {
lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>; lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
return stack::push(L, cf); return stack::push(L, cf);
} }
static int push(lua_State* L, constructor_list<Lists...>) {
lua_CFunction cf = call_detail::construct<T, detail::default_safe_function_calls, true, Lists...>;
return stack::push(L, cf);
}
};
template <typename L0, typename... Lists>
struct pusher<constructor_list<L0, Lists...>> {
typedef constructor_list<L0, Lists...> cl_t;
static int push(lua_State* L, cl_t cl) {
typedef typename meta::bind_traits<L0>::return_type T;
return stack::push<detail::tagged<T, cl_t>>(L, cl);
}
}; };
template <typename T, typename... Fxs> template <typename T, typename... Fxs>
@ -14167,6 +14181,16 @@ namespace sol {
} }
}; };
template <typename F, typename... Fxs>
struct pusher<constructor_wrapper<F, Fxs...>> {
template <typename C>
static int push(lua_State* L, C&& c) {
typedef typename meta::bind_traits<F>::template arg_at<0> arg0;
typedef meta::unqualified_t<std::remove_pointer_t<arg0>> T;
return stack::push<detail::tagged<T, constructor_wrapper<F, Fxs...>>>(L, std::forward<C>(c));
}
};
template <typename T> template <typename T>
struct pusher<detail::tagged<T, destructor_wrapper<void>>> { struct pusher<detail::tagged<T, destructor_wrapper<void>>> {
static int push(lua_State* L, destructor_wrapper<void>) { static int push(lua_State* L, destructor_wrapper<void>) {
@ -14177,11 +14201,38 @@ namespace sol {
template <typename T, typename Fx> template <typename T, typename Fx>
struct pusher<detail::tagged<T, destructor_wrapper<Fx>>> { struct pusher<detail::tagged<T, destructor_wrapper<Fx>>> {
static int push(lua_State* L, destructor_wrapper<Fx> c) { static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>; lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
int upvalues = 0; int upvalues = 0;
upvalues += stack::push(L, nullptr); upvalues += stack::push(L, nullptr);
upvalues += stack::push<user<T>>(L, std::move(c)); upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
return stack::push(L, c_closure(cf, upvalues));
}
static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>, 2>;
int upvalues = 0;
upvalues += stack::push(L, nullptr);
upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
return stack::push(L, c_closure(cf, upvalues));
}
};
template <typename Fx>
struct pusher<destructor_wrapper<Fx>> {
static int push(lua_State* L, destructor_wrapper<Fx>&& c) {
lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
int upvalues = 0;
upvalues += stack::push(L, nullptr);
upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, std::move(c));
return stack::push(L, c_closure(cf, upvalues));
}
static int push(lua_State* L, const destructor_wrapper<Fx>& c) {
lua_CFunction cf = call_detail::call_user<void, false, false, destructor_wrapper<Fx>, 2>;
int upvalues = 0;
upvalues += stack::push(L, nullptr);
upvalues += stack::push<user<destructor_wrapper<Fx>>>(L, c);
return stack::push(L, c_closure(cf, upvalues)); return stack::push(L, c_closure(cf, upvalues));
} }
}; };
@ -14868,11 +14919,12 @@ namespace sol {
template <typename... Ret, typename... Args> template <typename... Ret, typename... Args>
decltype(auto) call(Args&&... args) { decltype(auto) call(Args&&... args) {
#ifdef SOL_SAFE_FUNCTION #if defined(_MSC_FULL_VER) && _MSC_FULL_VER <= 191326128 && _MSC_FULL_VER >= 191200000
return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...); // MSVC is ass sometimes
return get<function>().call<Ret...>(std::forward<Args>(args)...);
#else #else
return get<function>().template call<Ret...>(std::forward<Args>(args)...); return get<function>().template call<Ret...>(std::forward<Args>(args)...);
#endif // Safe function usage #endif
} }
template <typename... Args> template <typename... Args>
@ -20079,9 +20131,8 @@ namespace sol {
template <typename... Ret, typename... Args> template <typename... Ret, typename... Args>
decltype(auto) call(Args&&... args) { decltype(auto) call(Args&&... args) {
#if defined(_MSC_VER) && _MSC_VER == 1913 #if defined(_MSC_FULL_VER) && _MSC_FULL_VER <= 191326128 && _MSC_FULL_VER >= 191200000
// This compiler is bananas // MSVC is ass sometimes
// B, A N A N A S
return get<protected_function>().call<Ret...>(std::forward<Args>(args)...); return get<protected_function>().call<Ret...>(std::forward<Args>(args)...);
#else #else
return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...); return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...);

4
single/sol/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 2018-03-12 00:06:07.281639 UTC // Generated 2018-03-17 13:09:07.970531 UTC
// This header was generated with sol v2.19.5 (revision 22ecb74) // This header was generated with sol v2.19.5 (revision 947945d)
// https://github.com/ThePhD/sol2 // https://github.com/ThePhD/sol2
#ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP #ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP

5
sol/load_result.hpp
View File

@ -122,7 +122,12 @@ namespace sol {
template <typename... Ret, typename... Args> template <typename... Ret, typename... Args>
decltype(auto) call(Args&&... args) { decltype(auto) call(Args&&... args) {
#if defined(_MSC_FULL_VER) && _MSC_FULL_VER <= 191326128 && _MSC_FULL_VER >= 191200000
// MSVC is ass sometimes
return get<protected_function>().call<Ret...>(std::forward<Args>(args)...);
#else
return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...); return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...);
#endif
} }
template <typename... Args> template <typename... Args>

7
sol/proxy.hpp
View File

@ -126,11 +126,12 @@ namespace sol {
template <typename... Ret, typename... Args> template <typename... Ret, typename... Args>
decltype(auto) call(Args&&... args) { decltype(auto) call(Args&&... args) {
#ifdef SOL_SAFE_FUNCTION #if defined(_MSC_FULL_VER) && _MSC_FULL_VER <= 191326128 && _MSC_FULL_VER >= 191200000
return get<protected_function>().template call<Ret...>(std::forward<Args>(args)...); // MSVC is ass sometimes
return get<function>().call<Ret...>(std::forward<Args>(args)...);
#else #else
return get<function>().template call<Ret...>(std::forward<Args>(args)...); return get<function>().template call<Ret...>(std::forward<Args>(args)...);
#endif // Safe function usage #endif
} }
template <typename... Args> template <typename... Args>