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

std decay, huh?

Browse Source 
change base walk comparison to be less derp
This commit is contained in:
ThePhD 2018-09-28 05:24:46 -07:00
parent 015ef6a37a
commit 50f92be1c7
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/sol/usertype_storage.hpp
View File

@ -84,13 +84,19 @@ namespace u_detail {
template <bool is_index = true, bool is_variable = false> template <bool is_index = true, bool is_variable = false>
static int index_call_with_(lua_State* L, void* target) { static int index_call_with_(lua_State* L, void* target) {
if constexpr (!is_variable) { if constexpr (!is_variable) {
// set up upvalues if constexpr (std::is_same_v<std::decay_t<F>, lua_CFunction> || std::is_same_v<std::decay_t<F>, lua_CFunction_ref>) {
// for a chained call auto& f = *static_cast<std::decay_t<F>*>(target);
int upvalues = 0; return stack::push(L, f);
upvalues += stack::push(L, nullptr); }
upvalues += stack::push(L, target); else {
auto cfunc = &call<is_index, is_variable>; // set up upvalues
return stack::push(L, c_closure(cfunc, upvalues)); // for a chained call
int upvalues = 0;
upvalues += stack::push(L, nullptr);
upvalues += stack::push(L, target);
auto cfunc = &call<is_index, is_variable>;
return stack::push(L, c_closure(cfunc, upvalues));
}
} }
else { else {
constexpr int boost = !detail::is_non_factory_constructor<F>::value constexpr int boost = !detail::is_non_factory_constructor<F>::value
@ -172,7 +178,7 @@ namespace u_detail {
// TODO: get base table, dump it out // TODO: get base table, dump it out
usertype_storage_base& base_storage = get_usertype_storage<Base>(L); usertype_storage_base& base_storage = get_usertype_storage<Base>(L);
base_result = self_index_call<true>(bases(), L, base_storage); base_result = self_index_call<true>(bases(), L, base_storage);
keep_going = base_result != base_walking_failed_index; keep_going = base_result == base_walking_failed_index;
} }
template <typename Base> template <typename Base>
@ -185,8 +191,8 @@ namespace u_detail {
(void)self; (void)self;
// TODO: get base table, dump it out // TODO: get base table, dump it out
usertype_storage_base& base_storage = get_usertype_storage<Base>(L); usertype_storage_base& base_storage = get_usertype_storage<Base>(L);
base_result = self_index_call<true>(bases(), L, base_storage); base_result = self_new_index_call<true>(bases(), L, base_storage);
keep_going = base_result != base_walking_failed_index; keep_going = base_result == base_walking_failed_index;
} }
template <bool base_walking = false, bool from_named_metatable = false, typename... Bases> template <bool base_walking = false, bool from_named_metatable = false, typename... Bases>