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

Statikk trampolines and new tests for the newly opened issue

Browse Source 
Closes #119
This commit is contained in:
ThePhD 2016-06-15 12:00:25 -04:00
parent d76b7ebe09
commit 3bece97a40
2 changed files with 75 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sol/usertype_metatable.hpp
View File

@ -214,7 +214,7 @@ namespace sol {
string_detail::string_shim name = usertype_detail::make_shim(std::get<I0>(functions));
if (accessor == name) {
if (is_variable_binding<decltype(std::get<I1>(functions))>::value) {
return call_with<I1, is_index, true>(L, *this);
return real_call_with<I1, is_index, true>(L, *this);
}
return stack::push(L, c_closure(call<I1, is_index>, stack::push(L, light<usertype_metatable>(*this))));
}
@ -222,27 +222,51 @@ namespace sol {
}
template <std::size_t I, bool is_index = true, bool is_variable = false>
static int call(lua_State* L) {
static int real_call(lua_State* L) {
usertype_metatable& f = stack::get<light<usertype_metatable>>(L, up_value_index(1));
return call_with<I, is_index, is_variable>(L, f);
return real_call_with<I, is_index, is_variable>(L, f);
}
template <std::size_t I, bool is_index = true, bool is_variable = false>
static int call_with(lua_State* L, usertype_metatable& um) {
static int real_call_with(lua_State* L, usertype_metatable& um) {
auto& f = call_detail::pick(std::integral_constant<bool, is_index>(), std::get<I>(um.functions));
return call_detail::call_wrapped<T, is_index, is_variable>(L, f);
}
static int index_call(lua_State* L) {
static int real_index_call(lua_State* L) {
usertype_metatable& f = stack::get<light<usertype_metatable>>(L, up_value_index(1));
string_detail::string_shim accessor = stack::get<string_detail::string_shim>(L, -1);
return f.find_call(std::true_type(), std::make_index_sequence<std::tuple_size<Tuple>::value>(), L, accessor);
if (stack::get<type>(L, -1) == type::string) {
string_detail::string_shim accessor = stack::get<string_detail::string_shim>(L, -1);
return f.find_call(std::true_type(), std::make_index_sequence<std::tuple_size<Tuple>::value>(), L, accessor);
}
return f.indexfunc(L);
}
static int real_new_index_call(lua_State* L) {
usertype_metatable& f = stack::get<light<usertype_metatable>>(L, up_value_index(1));
if (stack::get<type>(L, -2) == type::string) {
string_detail::string_shim accessor = stack::get<string_detail::string_shim>(L, -2);
return f.find_call(std::false_type(), std::make_index_sequence<std::tuple_size<Tuple>::value>(), L, accessor);
}
return f.indexfunc(L);
}
template <std::size_t I, bool is_index = true, bool is_variable = false>
static int call(lua_State* L) {
return detail::static_trampoline<(&real_call<I, is_index, is_variable>)>(L);
}
template <std::size_t I, bool is_index = true, bool is_variable = false>
static int call_with(lua_State* L) {
return detail::static_trampoline<(&real_call_with<I, is_index, is_variable>)>(L);
}
static int index_call(lua_State* L) {
return detail::static_trampoline<(&real_index_call)>(L);
}
static int new_index_call(lua_State* L) {
usertype_metatable& f = stack::get<light<usertype_metatable>>(L, up_value_index(1));
string_detail::string_shim accessor = stack::get<string_detail::string_shim>(L, -2);
return f.find_call(std::false_type(), std::make_index_sequence<std::tuple_size<Tuple>::value>(), L, accessor);
return detail::static_trampoline<(&real_new_index_call)>(L);
}
virtual int push_um(lua_State* L) override {

41
tests.cpp
View File

@ -416,3 +416,44 @@ print('name = ' .. obj.props.name)
std::string name = lua["obj"]["props"]["name"];
REQUIRE(name == "test name");
}
TEST_CASE("misc/indexing_numbers", "make sure indexing functions can be override on usertypes") {
class vector {
public:
double data[3];
vector() : data{ 0,0,0 } {}
double& operator[](int i)
{
return data[i];
}
static double my_index(vector& v, int i)
{
return v[i];
}
static void my_new_index(vector& v, int i, double x)
{
v[i] = x;
}
};
sol::state lua;
lua.open_libraries(sol::lib::base);
lua.new_usertype<vector>("vector", sol::constructors<sol::types<>>(),
sol::meta_function::index, &vector::my_index,
sol::meta_function::new_index, &vector::my_new_index);
lua.script("v = vector.new()\n"
"print(v[1])\n"
"v[2] = 3\n"
"print(v[2])\n"
);
vector& v = lua["v"];
REQUIRE(v[0] == 0.0);
REQUIRE(v[1] == 0.0);
REQUIRE(v[2] == 3.0);
}