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

thread and state awareness in all sol lua types

Browse Source
This commit is contained in:
ThePhD 2017-01-07 00:40:44 -05:00
parent 01aeaf6492
commit 3baa99f941
2 changed files with 105 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sol/stack_reference.hpp
View File

@ -50,7 +50,10 @@ namespace sol {
} }
int push(lua_State* Ls) const noexcept { int push(lua_State* Ls) const noexcept {
lua_pushvalue(Ls, index); lua_pushvalue(lua_state(), index);
if (Ls != lua_state()) {
lua_xmove(lua_state(), Ls, 1);
}
return 1; return 1;
} }

11
sol/variadic_args.hpp
View File

@ -192,11 +192,18 @@ namespace sol {
const_reverse_iterator crend() const { return std::reverse_iterator<const_iterator>(cend()); } const_reverse_iterator crend() const { return std::reverse_iterator<const_iterator>(cend()); }
int push() const { int push() const {
push(L);
}
int push(lua_State* target) const {
int pushcount = 0; int pushcount = 0;
for (int i = index; i <= stacktop; ++i) { for (int i = index; i <= stacktop; ++i) {
lua_pushvalue(L, i); lua_pushvalue(L, i);
pushcount += 1; pushcount += 1;
} }
if (target != L) {
lua_xmove(L, target, pushcount);
}
return pushcount; return pushcount;
} }
@ -226,8 +233,8 @@ namespace sol {
template <> template <>
struct pusher<variadic_args> { struct pusher<variadic_args> {
static int push(lua_State*, const variadic_args& ref) { static int push(lua_State* L, const variadic_args& ref) {
return ref.push(); return ref.push(L);
} }
}; };
} // stack } // stack