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

ipairs and pairs improved support, folding the registration table down to avoid duplicated code

Browse Source
This commit is contained in:
ThePhD 2016-10-21 07:05:58 -04:00
parent 661e361b26
commit a65f795b79
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sol/container_usertype_metatable.hpp
View File

@ -298,11 +298,12 @@ namespace sol {
iter& i = stack::get<user<iter>>(L, 1); iter& i = stack::get<user<iter>>(L, 1);
auto& source = i.source; auto& source = i.source;
auto& it = i.it; auto& it = i.it;
std::advance(it, 1);
if (it == end(source)) { if (it == end(source)) {
return 0; return 0;
} }
return stack::multi_push_reference(L, it->first, it->second); int p = stack::multi_push_reference(L, it->first, it->second);
std::advance(it, 1);
return p;
} }
static int real_pairs_call(lua_State* L) { static int real_pairs_call(lua_State* L) {
@ -341,6 +342,22 @@ namespace sol {
}; };
namespace stack { namespace stack {
namespace stack_detail {
template <typename T>
inline const auto& container_metatable() {
typedef container_usertype_metatable<std::remove_pointer_t<T>> cumt;
static const luaL_Reg reg[] = {
{ "__index", &cumt::index_call },
{ "__newindex", &cumt::new_index_call },
{ "__pairs", &cumt::pairs_call },
{ "__ipairs", &cumt::pairs_call },
{ "__len", &cumt::length_call },
{ std::is_pointer<T>::value ? nullptr : "__gc", std::is_pointer<T>::value ? nullptr : &detail::usertype_alloc_destroy<T> },
{ nullptr, nullptr }
};
return reg;
}
}
template<typename T> template<typename T>
struct pusher<T, std::enable_if_t<meta::all<meta::has_begin_end<T>, meta::neg<meta::any<std::is_base_of<reference, T>, std::is_base_of<stack_reference, T>>>>::value>> { struct pusher<T, std::enable_if_t<meta::all<meta::has_begin_end<T>, meta::neg<meta::any<std::is_base_of<reference, T>, std::is_base_of<stack_reference, T>>>>::value>> {
@ -349,14 +366,7 @@ namespace sol {
auto fx = [&L]() { auto fx = [&L]() {
const char* metakey = &usertype_traits<T>::metatable[0]; const char* metakey = &usertype_traits<T>::metatable[0];
if (luaL_newmetatable(L, metakey) == 1) { if (luaL_newmetatable(L, metakey) == 1) {
luaL_Reg reg[] = { const auto& reg = stack_detail::container_metatable<T>();
{ "__index", &cumt::index_call },
{ "__newindex", &cumt::new_index_call },
{ "__pairs", &cumt::pairs_call },
{ "__len", &cumt::length_call },
{ "__gc", &detail::usertype_alloc_destroy<T> },
{ nullptr, nullptr }
};
luaL_setfuncs(L, reg, 0); luaL_setfuncs(L, reg, 0);
} }
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
@ -368,14 +378,7 @@ namespace sol {
auto fx = [&L]() { auto fx = [&L]() {
const char* metakey = &usertype_traits<T>::metatable[0]; const char* metakey = &usertype_traits<T>::metatable[0];
if (luaL_newmetatable(L, metakey) == 1) { if (luaL_newmetatable(L, metakey) == 1) {
luaL_Reg reg[] = { const auto& reg = stack_detail::container_metatable<T>();
{ "__index", &cumt::index_call },
{ "__newindex", &cumt::new_index_call },
{ "__pairs", &cumt::pairs_call },
{ "__len", &cumt::length_call },
{ "__gc", &detail::usertype_alloc_destroy<T> },
{ nullptr, nullptr }
};
luaL_setfuncs(L, reg, 0); luaL_setfuncs(L, reg, 0);
} }
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
@ -391,13 +394,7 @@ namespace sol {
auto fx = [&L]() { auto fx = [&L]() {
const char* metakey = &usertype_traits<meta::unqualified_t<T>*>::metatable[0]; const char* metakey = &usertype_traits<meta::unqualified_t<T>*>::metatable[0];
if (luaL_newmetatable(L, metakey) == 1) { if (luaL_newmetatable(L, metakey) == 1) {
luaL_Reg reg[] = { const auto& reg = stack_detail::container_metatable<T*>();
{ "__index", &cumt::index_call },
{ "__newindex", &cumt::new_index_call },
{ "__pairs", &cumt::pairs_call },
{ "__len", &cumt::length_call },
{ nullptr, nullptr }
};
luaL_setfuncs(L, reg, 0); luaL_setfuncs(L, reg, 0);
} }
lua_setmetatable(L, -2); lua_setmetatable(L, -2);

9
sol/types.hpp
View File

@ -361,6 +361,7 @@ namespace sol {
new_index, new_index,
mode, mode,
call, call,
call_function = call,
metatable, metatable,
to_string, to_string,
length, length,
@ -377,7 +378,13 @@ namespace sol {
less_than, less_than,
less_than_or_equal_to, less_than_or_equal_to,
garbage_collect, garbage_collect,
call_function = call, floor_division,
bitwise_left_shift,
bitwise_right_shift,
bitwise_not,
bitwise_and,
bitwise_or,
bitwise_xor,
}; };
typedef meta_function meta_method; typedef meta_function meta_method;