diff --git a/crates/lune-std-ffi/src/c/c_arr.rs b/crates/lune-std-ffi/src/c/c_arr.rs index 7cd7bba..c4bbfc6 100644 --- a/crates/lune-std-ffi/src/c/c_arr.rs +++ b/crates/lune-std-ffi/src/c/c_arr.rs @@ -152,15 +152,15 @@ impl LuaUserData for CArr { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { // Subtype - method_provider::provide_ptr(methods); + method_provider::provide_ptr_info(methods); // ToString method_provider::provide_to_string(methods); // Realize method_provider::provide_box(methods); - method_provider::provide_from(methods); - method_provider::provide_into(methods); + method_provider::provide_from_data(methods); + method_provider::provide_into_data(methods); methods.add_method("offset", |_, this, offset: isize| { if this.length > (offset as usize) && offset >= 0 { diff --git a/crates/lune-std-ffi/src/c/c_func.rs b/crates/lune-std-ffi/src/c/c_func.rs index ff7952b..b323e3e 100644 --- a/crates/lune-std-ffi/src/c/c_func.rs +++ b/crates/lune-std-ffi/src/c/c_func.rs @@ -129,8 +129,8 @@ impl CFunc { impl LuaUserData for CFunc { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { // Subtype - method_provider::provide_ptr(methods); - method_provider::provide_arr(methods); + method_provider::provide_ptr_info(methods); + method_provider::provide_arr_info(methods); // ToString method_provider::provide_to_string(methods); diff --git a/crates/lune-std-ffi/src/c/c_helper.rs b/crates/lune-std-ffi/src/c/c_helper.rs index 68882df..fcede75 100644 --- a/crates/lune-std-ffi/src/c/c_helper.rs +++ b/crates/lune-std-ffi/src/c/c_helper.rs @@ -16,31 +16,31 @@ pub mod method_provider { }); } - pub fn provide_ptr<'lua, Target, M>(methods: &mut M) + pub fn provide_ptr_info<'lua, Target, M>(methods: &mut M) where M: LuaUserDataMethods<'lua, Target>, { - methods.add_function("ptr", |lua, this: LuaAnyUserData| { + methods.add_function("ptrInfo", |lua, this: LuaAnyUserData| { CPtr::from_userdata(lua, &this) }); } - pub fn provide_arr<'lua, Target, M>(methods: &mut M) + pub fn provide_arr_info<'lua, Target, M>(methods: &mut M) where M: LuaUserDataMethods<'lua, Target>, { - methods.add_function("arr", |lua, (this, length): (LuaAnyUserData, usize)| { + methods.add_function("arrInfo", |lua, (this, length): (LuaAnyUserData, usize)| { CArr::from_userdata(lua, &this, length) }); } - pub fn provide_from<'lua, Target, M>(methods: &mut M) + pub fn provide_from_data<'lua, Target, M>(methods: &mut M) where Target: NativeSize + NativeConvert, M: LuaUserDataMethods<'lua, Target>, { methods.add_method( - "from", + "fromData", |lua, this, (userdata, offset): (LuaAnyUserData, Option)| { let offset = offset.unwrap_or(0); @@ -57,13 +57,13 @@ pub mod method_provider { ); } - pub fn provide_into<'lua, Target, M>(methods: &mut M) + pub fn provide_into_data<'lua, Target, M>(methods: &mut M) where Target: NativeSize + NativeConvert, M: LuaUserDataMethods<'lua, Target>, { methods.add_method( - "into", + "intoData", |lua, this, (userdata, value, offset): (LuaAnyUserData, LuaValue, Option)| { let offset = offset.unwrap_or(0); diff --git a/crates/lune-std-ffi/src/c/c_ptr.rs b/crates/lune-std-ffi/src/c/c_ptr.rs index 840aa0f..c56e83b 100644 --- a/crates/lune-std-ffi/src/c/c_ptr.rs +++ b/crates/lune-std-ffi/src/c/c_ptr.rs @@ -114,8 +114,8 @@ impl LuaUserData for CPtr { fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { // Subtype - method_provider::provide_ptr(methods); - method_provider::provide_arr(methods); + method_provider::provide_ptr_info(methods); + method_provider::provide_arr_info(methods); // ToString method_provider::provide_to_string(methods); diff --git a/crates/lune-std-ffi/src/c/c_struct.rs b/crates/lune-std-ffi/src/c/c_struct.rs index 4ecbbd3..b0042e9 100644 --- a/crates/lune-std-ffi/src/c/c_struct.rs +++ b/crates/lune-std-ffi/src/c/c_struct.rs @@ -166,16 +166,16 @@ impl LuaUserData for CStruct { } fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { // Subtype - method_provider::provide_ptr(methods); - method_provider::provide_arr(methods); + method_provider::provide_ptr_info(methods); + method_provider::provide_arr_info(methods); // ToString method_provider::provide_to_string(methods); // Realize method_provider::provide_box(methods); - method_provider::provide_from(methods); - method_provider::provide_into(methods); + method_provider::provide_from_data(methods); + method_provider::provide_into_data(methods); methods.add_method("offset", |_, this, index: usize| { let offset = this.offset(index)?; diff --git a/crates/lune-std-ffi/src/c/c_type.rs b/crates/lune-std-ffi/src/c/c_type.rs index a907c68..c90f195 100644 --- a/crates/lune-std-ffi/src/c/c_type.rs +++ b/crates/lune-std-ffi/src/c/c_type.rs @@ -98,16 +98,16 @@ where fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) { // Subtype - method_provider::provide_ptr(methods); - method_provider::provide_arr(methods); + method_provider::provide_ptr_info(methods); + method_provider::provide_arr_info(methods); // ToString method_provider::provide_to_string(methods); // Realize method_provider::provide_box(methods); - method_provider::provide_from(methods); - method_provider::provide_into(methods); + method_provider::provide_from_data(methods); + method_provider::provide_into_data(methods); methods.add_function( "cast", diff --git a/crates/lune-std-ffi/src/ffi/ffi_ref/mod.rs b/crates/lune-std-ffi/src/ffi/ffi_ref/mod.rs index 9b23d5b..3534e98 100644 --- a/crates/lune-std-ffi/src/ffi/ffi_ref/mod.rs +++ b/crates/lune-std-ffi/src/ffi/ffi_ref/mod.rs @@ -186,7 +186,7 @@ impl LuaUserData for FfiRef { let ffiref = FfiRef::luaref(lua, this)?; Ok(ffiref) }); - methods.add_method("isNullptr", |_, this, ()| Ok(this.is_nullptr())); + methods.add_method("isNull", |_, this, ()| Ok(this.is_nullptr())); } } diff --git a/crates/lune-std-ffi/src/lib.rs b/crates/lune-std-ffi/src/lib.rs index 59648f1..c2fb844 100644 --- a/crates/lune-std-ffi/src/lib.rs +++ b/crates/lune-std-ffi/src/lib.rs @@ -23,7 +23,7 @@ use crate::{ pub fn module(lua: &Lua) -> LuaResult { let result = TableBuilder::new(lua)? .with_values(export_ctypes(lua)?)? - .with_value("nullRef", create_nullptr(lua)?)? + .with_function("nullRef", |lua, ()| create_nullptr(lua))? .with_function("box", |_lua, size: usize| Ok(FfiBox::new(size)))? .with_function("open", |_lua, name: String| FfiLib::new(name))? .with_function("structInfo", |lua, types: LuaTable| {