Reducing and organizing duplicated codes (#243)

Author: qwreey

crates/lune-std-ffi/src/c/c_arr.rs

@@ -145,7 +145,7 @@ impl LuaUserData for CArr {
         fields.add_field_function_get("inner", |lua, this: LuaAnyUserData| {
             let inner: LuaValue = get_association(lua, CARR_INNER, this)?
                 // It shouldn't happen.
-                .ok_or(LuaError::external("inner field not found"))?;
+                .ok_or_else(|| LuaError::external("inner field not found"))?;
             Ok(inner)
         });
     }

crates/lune-std-ffi/src/c/c_func.rs

@@ -158,7 +158,7 @@ impl LuaUserData for CFunc {
                         this.cif.as_raw_ptr(),
                         ptr::from_ref(&this.arg_info_list),
                         ptr::from_ref(&this.result_info),
-                        ffi_ref.get_pointer(0),
+                        ffi_ref.get_pointer(),
                     )
                 })?;
 

crates/lune-std-ffi/src/c/c_helper.rs

@@ -48,6 +48,9 @@ pub mod method_provider {
                 if !data_handle.check_boundary(offset, this.get_size()) {
                     return Err(LuaError::external("Out of bounds"));
                 }
+                if !data_handle.is_readable() {
+                    return Err(LuaError::external("Unreadable data handle"));
+                }
 
                 unsafe { this.luavalue_from(lua, offset, data_handle) }
             },
@@ -65,6 +68,7 @@ pub mod method_provider {
                 let offset = offset.unwrap_or(0);
 
                 let data_handle = &userdata.get_data_handle()?;
+                // use or functions
                 if !data_handle.check_boundary(offset, this.get_size()) {
                     return Err(LuaError::external("Out of bounds"));
                 }

crates/lune-std-ffi/src/c/c_ptr.rs

@@ -4,12 +4,17 @@ use libffi::middle::Type;
 use mlua::prelude::*;
 
 use super::{association_names::CPTR_INNER, c_helper, c_type_helper, method_provider};
-use crate::ffi::{
-    ffi_association::{get_association, set_association},
-    NativeConvert, NativeData, NativeSignedness, NativeSize,
+use crate::{
+    ffi::{
+        ffi_association::{get_association, set_association},
+        FfiRef, NativeConvert, NativeData, NativeSignedness, NativeSize,
+    },
+    libffi_helper::SIEE_OF_POINTER,
 };
 
-pub struct CPtr();
+pub struct CPtr {
+    inner_size: usize,
+}
 
 impl NativeSignedness for CPtr {
     fn get_signedness(&self) -> bool {
@@ -18,19 +23,36 @@ impl NativeSignedness for CPtr {
 }
 impl NativeSize for CPtr {
     fn get_size(&self) -> usize {
-        size_of::<*mut ()>()
+        SIEE_OF_POINTER
     }
 }
 impl NativeConvert for CPtr {
     // Convert luavalue into data, then write into ptr
     unsafe fn luavalue_into<'lua>(
         &self,
         _lua: &'lua Lua,
-        _offset: isize,
-        _data_handle: &Ref<dyn NativeData>,
-        _value: LuaValue<'lua>,
+        offset: isize,
+        data_handle: &Ref<dyn NativeData>,
+        value: LuaValue<'lua>,
     ) -> LuaResult<()> {
-        Err(LuaError::external("Conversion of pointer is not allowed"))
+        if let LuaValue::UserData(value_userdata) = value {
+            if value_userdata.is::<FfiRef>() {
+                let value_ref = value_userdata.borrow::<FfiRef>()?;
+                value_ref
+                    .check_boundary(0, self.inner_size)
+                    .then_some(())
+                    .ok_or_else(|| LuaError::external("boundary check failed"))?;
+                *data_handle
+                    .get_pointer()
+                    .byte_offset(offset)
+                    .cast::<*mut ()>() = value_ref.get_pointer();
+                Ok(())
+            } else {
+                Err(LuaError::external("Ptr:into only allows FfiRef"))
+            }
+        } else {
+            Err(LuaError::external("Conversion of pointer is not allowed"))
+        }
     }
 
     // Read data from ptr, then convert into luavalue
@@ -51,7 +73,9 @@ impl CPtr {
         lua: &'lua Lua,
         inner: &LuaAnyUserData,
     ) -> LuaResult<LuaAnyUserData<'lua>> {
-        let value = lua.create_userdata(Self())?;
+        let value = lua.create_userdata(Self {
+            inner_size: c_helper::get_size(inner)?,
+        })?;
 
         set_association(lua, CPTR_INNER, &value, inner)?;
 
@@ -83,7 +107,7 @@ impl LuaUserData for CPtr {
         fields.add_field_method_get("size", |_, _| Ok(size_of::<usize>()));
         fields.add_field_function_get("inner", |lua, this| {
             let inner = get_association(lua, CPTR_INNER, this)?
-                .ok_or(LuaError::external("inner type not found"))?;
+                .ok_or_else(|| LuaError::external("inner type not found"))?;
             Ok(inner)
         });
     }

crates/lune-std-ffi/src/c/c_struct.rs

@@ -3,7 +3,7 @@ use std::{cell::Ref, vec::Vec};
 use libffi::{low, middle::Type, raw};
 use mlua::prelude::*;
 
-use super::{association_names::CSTRUCT_INNER, c_helper, method_provider, CArr, CPtr};
+use super::{association_names::CSTRUCT_INNER, c_helper, method_provider};
 use crate::ffi::{
     ffi_association::{get_association, set_association},
     NativeConvert, NativeData, NativeSignedness, NativeSize, FFI_STATUS_NAMES,
@@ -56,7 +56,7 @@ impl CStruct {
 
     // Create new CStruct UserData with LuaTable.
     // Lock and hold table for .inner ref
-    pub fn new_from_table<'lua>(
+    pub fn from_table<'lua>(
         lua: &'lua Lua,
         table: LuaTable<'lua>,
     ) -> LuaResult<LuaAnyUserData<'lua>> {
@@ -74,7 +74,7 @@ impl CStruct {
     // <CStruct( u8, i32, size = 8 )>
     pub fn stringify(lua: &Lua, userdata: &LuaAnyUserData) -> LuaResult<String> {
         if let LuaValue::Table(fields) = get_association(lua, CSTRUCT_INNER, userdata)?
-            .ok_or(LuaError::external("Field table not found"))?
+            .ok_or_else(|| LuaError::external("Field table not found"))?
         {
             let mut result = String::from(" ");
             for i in 0..fields.raw_len() {
@@ -97,7 +97,7 @@ impl CStruct {
         let offset = self
             .inner_offset_list
             .get(index)
-            .ok_or(LuaError::external("Out of index"))?
+            .ok_or_else(|| LuaError::external("Out of index"))?
             .to_owned();
         Ok(offset)
     }
@@ -185,7 +185,7 @@ impl LuaUserData for CStruct {
         // By referencing the table to struct, the types inside do not disappear
         methods.add_function("field", |lua, (this, field): (LuaAnyUserData, usize)| {
             if let LuaValue::Table(fields) = get_association(lua, CSTRUCT_INNER, this)?
-                .ok_or(LuaError::external("Field table not found"))?
+                .ok_or_else(|| LuaError::external("Field table not found"))?
             {
                 let value: LuaValue = fields.raw_get(field + 1)?;
                 Ok(value)

crates/lune-std-ffi/src/c/c_type.rs

@@ -6,7 +6,6 @@ use libffi::middle::Type;
 use lune_utils::fmt::{pretty_format_value, ValueFormatConfig};
 use mlua::prelude::*;
 
-use super::{CArr, CPtr};
 use crate::{
     c::method_provider,
     ffi::{GetNativeData, NativeConvert, NativeData, NativeSignedness, NativeSize},

crates/lune-std-ffi/src/c/types/f32.rs

@@ -36,7 +36,7 @@ impl NativeConvert for CType<f32> {
             }
         };
         unsafe {
-            *(data_handle.get_pointer(offset).cast::<f32>()) = value;
+            *(data_handle.get_pointer().byte_offset(offset).cast::<f32>()) = value;
         }
         Ok(())
     }
@@ -47,7 +47,9 @@ impl NativeConvert for CType<f32> {
         offset: isize,
         data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
-        let value = unsafe { (*data_handle.get_pointer(offset).cast::<f32>()).into_lua(lua)? };
+        let value = unsafe {
+            (*data_handle.get_pointer().byte_offset(offset).cast::<f32>()).into_lua(lua)?
+        };
         Ok(value)
     }
 }

crates/lune-std-ffi/src/c/types/f64.rs

@@ -36,7 +36,7 @@ impl NativeConvert for CType<f64> {
             }
         };
         unsafe {
-            *(data_handle.get_pointer(offset).cast::<f64>()) = value;
+            *(data_handle.get_pointer().byte_offset(offset).cast::<f64>()) = value;
         }
         Ok(())
     }
@@ -47,7 +47,9 @@ impl NativeConvert for CType<f64> {
         offset: isize,
         data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
-        let value = unsafe { (*data_handle.get_pointer(offset).cast::<f64>()).into_lua(lua)? };
+        let value = unsafe {
+            (*data_handle.get_pointer().byte_offset(offset).cast::<f64>()).into_lua(lua)?
+        };
         Ok(value)
     }
 }

crates/lune-std-ffi/src/c/types/i128.rs

@@ -36,7 +36,7 @@ impl NativeConvert for CType<i128> {
             }
         };
         unsafe {
-            *(data_handle.get_pointer(offset).cast::<i128>()) = value;
+            *(data_handle.get_pointer().byte_offset(offset).cast::<i128>()) = value;
         }
         Ok(())
     }
@@ -47,7 +47,7 @@ impl NativeConvert for CType<i128> {
         offset: isize,
         data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
-        let value = unsafe { (*data_handle.get_pointer(offset).cast::<i128>()).into_lua(lua)? };
+        let value = unsafe { (*data_handle.get_pointer().byte_offset(offset).cast::<i128>()).into_lua(lua)? };
         Ok(value)
     }
 }

crates/lune-std-ffi/src/c/types/i16.rs

@@ -36,7 +36,7 @@ impl NativeConvert for CType<i16> {
             }
         };
         unsafe {
-            *(data_handle.get_pointer(offset).cast::<i16>()) = value;
+            *(data_handle.get_pointer().byte_offset(offset).cast::<i16>()) = value;
         }
         Ok(())
     }
@@ -47,7 +47,7 @@ impl NativeConvert for CType<i16> {
         offset: isize,
         data_handle: &Ref<dyn NativeData>,
     ) -> LuaResult<LuaValue<'lua>> {
-        let value = unsafe { (*data_handle.get_pointer(offset).cast::<i16>()).into_lua(lua)? };
+        let value = unsafe { (*data_handle.get_pointer().byte_offset(offset).cast::<i16>()).into_lua(lua)? };
         Ok(value)
     }
 }