michael/mlua
michael
/
mlua
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Possibly better stack behavior

This commit is contained in:
kyren 2017-10-23 15:17:46 -04:00
parent ba183b0119
commit 8c30acec4e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lua.rs
View File

@ -920,6 +920,8 @@ impl Lua {
let results = func.deref_mut()(&lua, args)?; let results = func.deref_mut()(&lua, args)?;
let nresults = results.len() as c_int; let nresults = results.len() as c_int;
check_stack(state, nresults);
for r in results { for r in results {
lua.push_value(state, r); lua.push_value(state, r);
} }
@ -948,6 +950,7 @@ impl Lua {
} }
} }
// Used 1 stack space, does not call checkstack
pub(crate) unsafe fn push_value(&self, state: *mut ffi::lua_State, value: Value) { pub(crate) unsafe fn push_value(&self, state: *mut ffi::lua_State, value: Value) {
match value { match value {
Value::Nil => { Value::Nil => {
@ -1051,6 +1054,7 @@ impl Lua {
} }
} }
// Used 1 stack space, does not call checkstack
pub(crate) unsafe fn push_ref(&self, state: *mut ffi::lua_State, lref: &LuaRef) { pub(crate) unsafe fn push_ref(&self, state: *mut ffi::lua_State, lref: &LuaRef) {
assert_eq!( assert_eq!(
lref.lua.main_state, lref.lua.main_state,
@ -1082,6 +1086,8 @@ impl Lua {
// Used if both an __index metamethod is set and regular methods, checks methods table // Used if both an __index metamethod is set and regular methods, checks methods table
// first, then __index metamethod. // first, then __index metamethod.
unsafe extern "C" fn meta_index_impl(state: *mut ffi::lua_State) -> c_int { unsafe extern "C" fn meta_index_impl(state: *mut ffi::lua_State) -> c_int {
check_stack(state, 2);
ffi::lua_pushvalue(state, -1); ffi::lua_pushvalue(state, -1);
ffi::lua_gettable(state, ffi::lua_upvalueindex(1)); ffi::lua_gettable(state, ffi::lua_upvalueindex(1));
if ffi::lua_isnil(state, -1) == 0 { if ffi::lua_isnil(state, -1) == 0 {