Modify struct Array.

Author: jmjoy

phper/src/arrays.rs

@@ -1,38 +1,33 @@
 use crate::{sys::*, values::Val};
-use std::mem::size_of;
+use std::mem::{size_of, zeroed};
 
+#[repr(transparent)]
 pub struct Array {
-    inner: *mut zend_array,
-    leak: bool,
+    inner: zend_array,
 }
 
 impl Array {
     pub fn new() -> Self {
         unsafe {
-            let inner = _emalloc(size_of::<zend_array>()).cast();
-            _zend_hash_init(inner, 0, None, true.into());
-            Self { inner, leak: false }
+            let mut array = zeroed::<Array>();
+            _zend_hash_init(&mut array.inner, 0, None, true.into());
+            array
         }
     }
 
     pub fn as_ptr(&self) -> *const zend_array {
-        self.inner
+        &self.inner
     }
 
     pub fn as_mut_ptr(&mut self) -> *mut zend_array {
-        self.inner
-    }
-
-    pub fn into_raw(mut self) -> *mut zend_array {
-        self.leak = true;
-        self.inner
+        &mut self.inner
     }
 
     pub fn insert(&mut self, key: impl AsRef<str>, value: &mut Val) {
         let key = key.as_ref();
         unsafe {
             phper_zend_hash_str_update(
-                self.inner,
+                &mut self.inner,
                 key.as_ptr().cast(),
                 key.len(),
                 value.as_mut_ptr(),
@@ -43,23 +38,20 @@ impl Array {
     pub fn get(&mut self, key: impl AsRef<str>) -> &mut Val {
         let key = key.as_ref();
         unsafe {
-            let value = zend_hash_str_find(self.inner, key.as_ptr().cast(), key.len());
+            let value = zend_hash_str_find(&mut self.inner, key.as_ptr().cast(), key.len());
             Val::from_mut(value)
         }
     }
 
     pub fn len(&mut self) -> usize {
-        unsafe { zend_array_count(self.inner) as usize }
+        unsafe { zend_array_count(&mut self.inner) as usize }
     }
 }
 
 impl Drop for Array {
     fn drop(&mut self) {
         unsafe {
-            if !self.leak {
-                zend_hash_destroy(self.inner);
-                _efree(self.inner.cast());
-            }
+            zend_hash_destroy(&mut self.inner);
         }
     }
 }

phper/src/strings.rs

@@ -1,34 +1,6 @@
 use crate::sys::*;
 
-pub struct ZString {
-    inner: *mut zend_string,
-}
-
-impl ZString {
-    pub fn new() -> Self {
-        unsafe {
-            Self {
-                inner: phper_zend_string_alloc(0, 1),
-            }
-        }
-    }
-}
-
-impl<T: AsRef<str>> From<T> for ZString {
-    fn from(t: T) -> Self {
-        let s = t.as_ref();
-        unsafe {
-            Self {
-                inner: phper_zend_string_init(s.as_ptr().cast(), s.len(), 1),
-            }
-        }
-    }
-}
-
-impl Drop for ZString {
-    fn drop(&mut self) {
-        unsafe {
-            phper_zend_string_release(self.inner);
-        }
-    }
+#[repr(transparent)]
+pub struct ZendString {
+    inner: zend_string,
 }

phper/src/values.rs

@@ -262,10 +262,10 @@ impl SetVal for String {
 }
 
 impl SetVal for Array {
-    fn set_val(self, val: &mut Val) {
+    fn set_val(mut self, val: &mut Val) {
         unsafe {
             let mut new_val = Val::empty();
-            phper_zval_arr(new_val.as_mut_ptr(), self.into_raw());
+            phper_zval_arr(new_val.as_mut_ptr(), self.as_mut_ptr());
             phper_zval_zval(
                 val.as_mut_ptr(),
                 new_val.as_mut_ptr(),