Change Throwable macro attribute, and Val drop_value method.

Author: jmjoy

examples/http-client/src/client.rs

@@ -1,5 +1,7 @@
 use crate::{
-    errors::HttpClientError, replace_and_get, replace_and_set, request::REQUEST_BUILDER_CLASS_NAME,
+    errors::HttpClientError,
+    request::REQUEST_BUILDER_CLASS_NAME,
+    utils::{replace_and_get, replace_and_set},
 };
 use phper::{
     classes::{ClassEntry, DynamicClass, Visibility},

examples/http-client/src/errors.rs

@@ -5,9 +5,11 @@ use phper::{
 
 const EXCEPTION_CLASS_NAME: &'static str = "HttpClient\\HttpClientException";
 
-#[derive(thiserror::Error, Debug)]
+#[derive(Debug, thiserror::Error, phper::Throwable)]
+#[throwable_class(EXCEPTION_CLASS_NAME)]
 pub enum HttpClientError {
     #[error(transparent)]
+    #[throwable(transparent)]
     Phper(#[from] phper::Error),
 
     #[error(transparent)]
@@ -20,15 +22,6 @@ pub enum HttpClientError {
     ResponseHadRead,
 }
 
-impl Throwable for HttpClientError {
-    fn class_entry(&self) -> &StatelessClassEntry {
-        match self {
-            HttpClientError::Phper(e) => e.class_entry(),
-            _ => ClassEntry::from_globals(EXCEPTION_CLASS_NAME).unwrap(),
-        }
-    }
-}
-
 pub fn make_exception_class() -> DynamicClass<()> {
     let mut exception_class = DynamicClass::new(EXCEPTION_CLASS_NAME);
     exception_class.extends("Exception");

examples/http-client/src/lib.rs

@@ -5,12 +5,12 @@ use crate::{
     response::make_response_class,
 };
 use phper::{modules::Module, php_get_module};
-use std::mem::replace;
 
 pub mod client;
 pub mod errors;
 pub mod request;
 pub mod response;
+pub mod utils;
 
 #[php_get_module]
 pub fn get_module() -> Module {
@@ -28,12 +28,3 @@ pub fn get_module() -> Module {
 
     module
 }
-
-fn replace_and_set<T>(t: &mut T, init: T, f: impl FnOnce(T) -> T) {
-    let x = f(replace(t, init));
-    let _ = replace(t, x);
-}
-
-fn replace_and_get<T, R>(t: &mut T, init: T, f: impl FnOnce(T) -> R) -> R {
-    f(replace(t, init))
-}

examples/http-client/src/request.rs

@@ -1,4 +1,4 @@
-use crate::{errors::HttpClientError, replace_and_get, response::RESPONSE_CLASS_NAME};
+use crate::{errors::HttpClientError, response::RESPONSE_CLASS_NAME, utils::replace_and_get};
 use phper::{
     classes::{ClassEntry, DynamicClass, Visibility},
     objects::Object,

examples/http-client/src/response.rs

@@ -1,4 +1,4 @@
-use crate::{errors::HttpClientError, replace_and_get};
+use crate::{errors::HttpClientError, utils::replace_and_get};
 use indexmap::map::IndexMap;
 use phper::{
     classes::{DynamicClass, Visibility},

examples/http-client/src/utils.rs

@@ -0,0 +1,10 @@
+use std::mem::replace;
+
+pub fn replace_and_set<T>(t: &mut T, init: T, f: impl FnOnce(T) -> T) {
+    let x = f(replace(t, init));
+    let _ = replace(t, x);
+}
+
+pub fn replace_and_get<T, R>(t: &mut T, init: T, f: impl FnOnce(T) -> R) -> R {
+    f(replace(t, init))
+}

phper-macros/src/derives.rs

@@ -1,7 +1,7 @@
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::{Attribute, Data, DeriveInput, Fields, Meta};
+use syn::{Attribute, Data, DeriveInput, Expr, Fields, Meta, MetaNameValue};
 
 pub(crate) fn derive_throwable(input: DeriveInput) -> syn::Result<TokenStream> {
     let crate_ident = parse_throwable_crate_ident(&input);
@@ -20,27 +20,9 @@ fn parse_throwable_crate_ident(input: &DeriveInput) -> TokenStream2 {
 }
 
 fn parse_throwable_attrs(input: &DeriveInput) -> syn::Result<TokenStream2> {
-    let attr = attributes_find_ident(&input.attrs, "throwable");
-    attr.map(|attr| {
-        attr.parse_args::<Meta>().and_then(|meta| match meta {
-            Meta::NameValue(name_value) => {
-                if !name_value.path.is_ident("class") {
-                    Err(syn::Error::new_spanned(
-                        &attr,
-                        "now only support #[throwable(error = ?)] for enum",
-                    ))
-                } else {
-                    let lit = name_value.lit;
-                    Ok(quote! { #lit })
-                }
-            }
-            _ => Err(syn::Error::new_spanned(
-                &attr,
-                "now only support #[throwable(error = ?)] for enum",
-            )),
-        })
-    })
-    .unwrap_or_else(|| Ok(quote! { "Exception" }))
+    let attr = attributes_find_ident(&input.attrs, "throwable_class");
+    attr.map(|attr| attr.parse_args::<Expr>().map(|expr| quote! { #expr }))
+        .unwrap_or_else(|| Ok(quote! { "Exception" }))
 }
 
 fn parse_throwable_input(

phper-macros/src/lib.rs

@@ -91,7 +91,7 @@ pub fn php_get_module(attr: TokenStream, input: TokenStream) -> TokenStream {
 /// ```
 ///
 /// TODO Support attribute `throwable` with `code` and `message`, integration tests.
-#[proc_macro_derive(Throwable, attributes(throwable, throwable_crate))]
+#[proc_macro_derive(Throwable, attributes(throwable, throwable_class, throwable_crate))]
 pub fn derive_throwable(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as DeriveInput);
     derives::derive_throwable(input).unwrap_or_else(|e| e.into_compile_error().into())

phper-sys/php_wrapper.c

@@ -160,3 +160,7 @@ bool phper_zend_hash_str_exists(const HashTable *ht, const char *str, size_t len
 bool phper_zend_hash_index_exists(const HashTable *ht, zend_ulong h) {
     return zend_hash_index_exists(ht, h) != 0;
 }
+
+void phper_zval_dtor(zval *zval_ptr) {
+    return zval_dtor(zval_ptr);
+}

phper-sys/php_wrapper.h

@@ -56,4 +56,6 @@ bool phper_call_user_function(HashTable *function_table, zval *object, zval *fun
 bool phper_zend_hash_str_exists(const HashTable *ht, const char *str, size_t len);
 bool phper_zend_hash_index_exists(const HashTable *ht, zend_ulong h);
 
+void phper_zval_dtor(zval *zval_ptr);
+
 #endif //PHPER_PHP_WRAPPER_H