Improve Val.

Author: jmjoy

phper-macros/tests/integration.rs

@@ -6,9 +6,16 @@ fn test_c_str() {
     assert_eq!(c_str!("foo"), unsafe {
         CStr::from_ptr("foo\0".as_ptr().cast())
     });
-    assert_eq!(unsafe { c_str!("bar") }, unsafe {
-        CStr::from_ptr("bar\0".as_ptr().cast())
-    });
+
+    assert_eq!(
+        {
+            #[allow(unused_unsafe)]
+            unsafe {
+                c_str!("bar")
+            }
+        },
+        unsafe { CStr::from_ptr("bar\0".as_ptr().cast()) }
+    );
 }
 
 #[test]

phper-sys/php_wrapper.c

@@ -46,7 +46,7 @@ void phper_zval_zval(zval *return_value, zval *zv, int copy, int dtor) {
     ZVAL_ZVAL(return_value, zv, copy, dtor);
 }
 
-void phper_zval_dup(zval *return_value, zval *zv) {
+void phper_zval_dup(zval *return_value, const zval *zv) {
     ZVAL_DUP(return_value, zv);
 }
 

phper-sys/php_wrapper.h

@@ -22,7 +22,7 @@ void phper_zval_stringl(zval *return_value, const char *s, size_t len);
 char *phper_z_strval_p(const zval *v);
 zval *phper_get_this(zend_execute_data *execute_data);
 void phper_zval_zval(zval *return_value, zval *zv, int copy, int dtor);
-void phper_zval_dup(zval *return_value, zval *zv);
+void phper_zval_dup(zval *return_value, const zval *zv);
 void phper_zval_copy(zval *return_value, zval *zv);
 void phper_zval_copy_value(zval *return_value, zval *zv);
 

phper/src/values.rs

@@ -164,6 +164,7 @@ impl Val {
         t.into()
     }
 
+    #[inline]
     pub fn into_inner(self) -> zval {
         self.inner
     }
@@ -263,6 +264,17 @@ impl Val {
         }
     }
 
+    pub fn as_mut_array(&mut self) -> crate::Result<&mut Array> {
+        if self.get_type().is_array() {
+            unsafe {
+                let ptr = self.inner.value.arr;
+                Ok(Array::from_mut_ptr(ptr).unwrap())
+            }
+        } else {
+            Err(self.must_be_type_error("array"))
+        }
+    }
+
     pub fn as_object(&self) -> crate::Result<&Object<()>> {
         if self.get_type().is_object() {
             unsafe {
@@ -336,6 +348,16 @@ impl Val {
     }
 }
 
+impl Clone for Val {
+    fn clone(&self) -> Self {
+        let mut val = Val::undef();
+        unsafe {
+            phper_zval_dup(val.as_mut_ptr(), self.as_ptr());
+        }
+        val
+    }
+}
+
 impl EAllocatable for Val {
     unsafe fn free(ptr: *mut Self) {
         ptr.as_mut().unwrap().drop_value();