tomaka/hlua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a closure destructor wrapper

Browse Source
This commit is contained in:
Michael Pankov 2017-04-15 18:56:14 +03:00
parent 9063d00579
commit 6b3fdeeaaa
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hlua/src/functions_write.rs
View File

@ -170,6 +170,16 @@ pub trait FunctionExt<P> {
fn call_mut(&mut self, params: P) -> Self::Output; fn call_mut(&mut self, params: P) -> Self::Output;
} }
// Called when an object inside Lua is being dropped.
#[inline]
extern "C" fn closure_destructor_wrapper<T>(lua: *mut ffi::lua_State) -> libc::c_int {
unsafe {
let obj = ffi::lua_touserdata(lua, -1);
ptr::drop_in_place((obj as *mut u8) as *mut T);
0
}
}
macro_rules! impl_function_ext { macro_rules! impl_function_ext {
() => ( () => (
impl<Z, R> FunctionExt<()> for Function<Z, (), R> where Z: FnMut() -> R { impl<Z, R> FunctionExt<()> for Function<Z, (), R> where Z: FnMut() -> R {
@ -214,7 +224,7 @@ macro_rules! impl_function_ext {
Err(_) => unreachable!(), Err(_) => unreachable!(),
}; };
ffi::lua_pushcfunction(lua.as_mut_lua().0, ::userdata::destructor_wrapper::<Z>); ffi::lua_pushcfunction(lua.as_mut_lua().0, closure_destructor_wrapper::<Z>);
ffi::lua_settable(lua.as_mut_lua().0, -3); ffi::lua_settable(lua.as_mut_lua().0, -3);
} }
ffi::lua_setmetatable(lua_raw.0, -2); ffi::lua_setmetatable(lua_raw.0, -2);
@ -281,7 +291,7 @@ macro_rules! impl_function_ext {
Err(_) => unreachable!(), Err(_) => unreachable!(),
}; };
ffi::lua_pushcfunction(lua.as_mut_lua().0, ::userdata::destructor_wrapper::<Z>); ffi::lua_pushcfunction(lua.as_mut_lua().0, closure_destructor_wrapper::<Z>);
ffi::lua_settable(lua.as_mut_lua().0, -3); ffi::lua_settable(lua.as_mut_lua().0, -3);
} }
ffi::lua_setmetatable(lua_raw.0, -2); ffi::lua_setmetatable(lua_raw.0, -2);
@ -552,7 +562,7 @@ mod tests {
} }
} }
{ {
let foo = Foo { }; let foo = ::std::rc::Rc::new(Foo { });
{ {
let mut lua = Lua::new(); let mut lua = Lua::new();

2
hlua/src/userdata.rs
View File

@ -18,7 +18,7 @@ use LuaTable;
// Called when an object inside Lua is being dropped. // Called when an object inside Lua is being dropped.
#[inline] #[inline]
pub extern "C" fn destructor_wrapper<T>(lua: *mut ffi::lua_State) -> libc::c_int { extern "C" fn destructor_wrapper<T>(lua: *mut ffi::lua_State) -> libc::c_int {
unsafe { unsafe {
let obj = ffi::lua_touserdata(lua, -1); let obj = ffi::lua_touserdata(lua, -1);
ptr::drop_in_place(obj as *mut TypeId); ptr::drop_in_place(obj as *mut TypeId);