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

The new constructor syntax was very easy to implement...

Browse Source
This commit is contained in:
ThePhD 2017-03-16 03:07:20 -04:00
parent 82482bfe3e
commit 21f59a997a
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sol/call.hpp
View File

@ -47,7 +47,7 @@ namespace sol {
} }
template <typename T, typename List> template <typename T, typename List>
struct void_call; struct void_call : void_call<T, meta::function_args_t<List>> {};
template <typename T, typename... Args> template <typename T, typename... Args>
struct void_call<T, types<Args...>> { struct void_call<T, types<Args...>> {
@ -345,12 +345,12 @@ namespace sol {
template <typename V> template <typename V>
static int call(lua_State* L, V&& f) { static int call(lua_State* L, V&& f) {
return call_const(std::is_const<typename traits_type::return_type>(), L, f); return call_const(std::is_const<typename traits_type::return_type>(), L, std::forward<V>(f));
} }
template <typename V> template <typename V>
static int call(lua_State* L, V&& f, object_type& o) { static int call(lua_State* L, V&& f, object_type& o) {
return call_const(std::is_const<typename traits_type::return_type>(), L, f, o); return call_const(std::is_const<typename traits_type::return_type>(), L, std::forward<V>(f), o);
} }
}; };
@ -364,7 +364,7 @@ namespace sol {
static int call(lua_State* L, V&& f, object_type& o) { static int call(lua_State* L, V&& f, object_type& o) {
typedef typename wrap::returns_list returns_list; typedef typename wrap::returns_list returns_list;
typedef typename wrap::caller caller; typedef typename wrap::caller caller;
return stack::call_into_lua<checked>(returns_list(), types<>(), L, boost + ( is_variable ? 3 : 2 ), caller(), f, o); return stack::call_into_lua<checked>(returns_list(), types<>(), L, boost + ( is_variable ? 3 : 2 ), caller(), std::forward<V>(f), o);
} }
template <typename V> template <typename V>

21
sol/usertype_metatable.hpp
View File

@ -174,15 +174,24 @@ namespace sol {
template <typename T, bool is_simple> template <typename T, bool is_simple>
inline int metatable_newindex(lua_State* L) { inline int metatable_newindex(lua_State* L) {
int isnum = 0; int isnum = 0;
lua_Integer magic = lua_tointegerx(L, lua_upvalueindex(4), &isnum); lua_Integer magic = lua_tointegerx(L, upvalue_index(4), &isnum);
if (isnum != 0 && magic == toplevel_magic) { if (isnum != 0 && magic == toplevel_magic) {
bool mustindex = lua_isboolean(L, lua_upvalueindex(5)) != 0 && (lua_toboolean(L, lua_upvalueindex(5)) != 0); bool mustindex = lua_isboolean(L, upvalue_index(5)) != 0 && (lua_toboolean(L, upvalue_index(5)) != 0);
if (!is_simple && mustindex) { if (!is_simple && mustindex) {
mapping_t& mapping = stack::get<light<mapping_t>>(L, lua_upvalueindex(3)); mapping_t& mapping = stack::get<light<mapping_t>>(L, upvalue_index(3));
std::vector<object>& runtime = stack::get<light<std::vector<object>>>(L, lua_upvalueindex(2)); std::vector<object>& runtime = stack::get<light<std::vector<object>>>(L, upvalue_index(2));
int target = static_cast<int>(runtime.size()); int target = static_cast<int>(runtime.size());
runtime.emplace_back(L, 3); std::string accessor = stack::get<std::string>(L, 2);
mapping.emplace_hint(mapping.cend(), stack::get<std::string>(L, 2), call_information(&runtime_object_call, &runtime_object_call, target)); auto preexistingit = mapping.find(accessor);
if (preexistingit == mapping.cend()) {
target = preexistingit->second.runtime_target;
runtime[target] = sol::object(L, 3);
preexistingit->second = call_information(&runtime_object_call, &runtime_object_call, target);
}
else {
runtime.emplace_back(L, 3);
mapping.emplace_hint(mapping.cend(), accessor, call_information(&runtime_object_call, &runtime_object_call, target));
}
} }
for (std::size_t i = 0; i < 4; lua_pop(L, 1), ++i) { for (std::size_t i = 0; i < 4; lua_pop(L, 1), ++i) {
const char* metakey = nullptr; const char* metakey = nullptr;

1
test_usertypes.cpp
View File

@ -715,7 +715,6 @@ TEST_CASE("usertype/overloading", "Check if overloading works properly for usert
REQUIRE((lua["a"] == 1)); REQUIRE((lua["a"] == 1));
REQUIRE((lua["b"] == 3.5)); REQUIRE((lua["b"] == 3.5));
REQUIRE((lua["c"] == bark_58)); REQUIRE((lua["c"] == bark_58));
REQUIRE_THROWS(lua.script("r:func(1,2,'meow')")); REQUIRE_THROWS(lua.script("r:func(1,2,'meow')"));
} }