Design ini api.

jmjoy · jmjoy · commit ef3e17c3e250 · 2020-11-01T20:19:35.000+08:00
diff --git a/examples/simple/src/lib.rs b/examples/simple/src/lib.rs
@@ -1,11 +1,13 @@
 #![feature(allocator_api)]
+#![feature(const_raw_ptr_deref)]
 
 use phper::{c_str_ptr, php_fn, ebox};
 use phper::sys::{ZEND_RESULT_CODE_SUCCESS, zend_parse_parameters, zend_internal_arg_info, zend_function_entry, PHP_INI_SYSTEM};
-use phper::sys::{zend_ini_entry_def, zend_module_entry, zend_register_ini_entries, zend_unregister_ini_entries};
-use phper::zend::api::FunctionEntries;
+use phper::sys::{zend_ini_entry_def, zend_module_entry, zend_register_ini_entries, zend_unregister_ini_entries, OnUpdateBool};
+use phper::sys::{OnUpdateString};
+use phper::zend::api::{FunctionEntries, ModuleGlobals};
 use phper::zend::compile::InternalArgInfos;
-use phper::zend::ini::IniEntryDefs;
+use phper::zend::ini::{IniEntryDefs, ini_entry_def_end};
 use phper::zend::modules::ModuleEntry;
 use phper::zend::types::{ExecuteData, Val, SetVal, Value};
 use phper::{
@@ -18,21 +20,15 @@ use std::mem;
 use std::mem::{size_of, transmute};
 use std::os::raw::{c_char, c_int, c_uchar, c_uint, c_ushort};
 use std::ptr::{null, null_mut};
+use phper::zend::exceptions::MyException;
 
-static INI_ENTRIES: IniEntryDefs<2> = IniEntryDefs::new([
-    zend_ini_entry_def {
-        name: c_str_ptr!("simple.enable"),
-        on_modify: None,
-        mh_arg1: null_mut(),
-        mh_arg2: null_mut(),
-        mh_arg3: null_mut(),
-        value: c_str_ptr!("1"),
-        displayer: None,
-        modifiable: PHP_INI_SYSTEM as c_int,
-        name_length: 0,
-        value_length: 0,
-    },
-    unsafe { transmute([0u8; size_of::<zend_ini_entry_def>()]) },
+static SIMPLE_ENABLE: ModuleGlobals<bool> = ModuleGlobals::new(false);
+static SIMPLE_TEXT: ModuleGlobals<*const c_char> = ModuleGlobals::new(null());
+
+static INI_ENTRIES: IniEntryDefs<3> = IniEntryDefs::new([
+    SIMPLE_ENABLE.create_ini_entry_def("simple.enable", "1", Some(OnUpdateBool), PHP_INI_SYSTEM),
+    SIMPLE_TEXT.create_ini_entry_def("simple.text", "", Some(OnUpdateString), PHP_INI_SYSTEM),
+    ini_entry_def_end(),
 ]);
 
 #[php_minit_function]
@@ -82,10 +78,13 @@ pub fn test_simple(execute_data: ExecuteData) -> impl SetVal {
             &mut b_len,
         ) != ZEND_RESULT_CODE_SUCCESS
         {
-            return Value::Null;
+            return None;
         }
 
-        Value::String(format!(
+        let s = CStr::from_ptr((*SIMPLE_TEXT.get())).to_str().unwrap();
+        println!("simple.text: '{}'", s);
+
+        Some(format!(
             "(a . b) = {}{}",
             CStr::from_ptr(a).to_str().unwrap(),
             CStr::from_ptr(b).to_str().unwrap(),
diff --git a/phper-macros/src/lib.rs b/phper-macros/src/lib.rs
@@ -99,4 +99,3 @@ pub fn php_rshutdown_function(_attr: TokenStream, input: TokenStream) -> TokenSt
 pub fn php_minfo_function(_attr: TokenStream, input: TokenStream) -> TokenStream {
     info_fn(input, "zm_info_")
 }
-
diff --git a/phper-macros/src/utils.rs b/phper-macros/src/utils.rs
@@ -1,6 +1,9 @@
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{parse_macro_input, Expr};
+use syn::{parse_macro_input, Expr, Fields};
+use syn::parse::Nothing;
+use syn::ItemStruct;
+use proc_macro2::{TokenTree, Group};
 
 pub(crate) fn c_str(input: TokenStream) -> TokenStream {
     let input = parse_macro_input!(input as Expr);
diff --git a/phper-sys/php_wrapper.h b/phper-sys/php_wrapper.h
@@ -4,6 +4,7 @@
 #include <php.h>
 #include <php_ini.h>
 #include <ext/standard/info.h>
+#include <zend_exceptions.h>
 
 zend_string *zend_string_init_(const char *str, size_t len, int persistent);
 zend_string *zend_new_interned_string_(zend_string *str);
diff --git a/phper/src/lib.rs b/phper/src/lib.rs
@@ -1,4 +1,6 @@
 #![feature(min_const_generics)]
+#![feature(const_fn_fn_ptr_basics)]
+#![feature(const_fn_transmute)]
 
 /*!
 A library that allows us to write PHP extensions using pure Rust and using safe Rust whenever possible.
diff --git a/phper/src/zend/api.rs b/phper/src/zend/api.rs
@@ -1,5 +1,40 @@
-use crate::sys::zend_function_entry;
+use crate::sys::{zend_function_entry, zend_ini_entry_def};
 use std::cell::UnsafeCell;
+use std::os::raw::{c_char, c_int, c_void};
+use crate::zend::ini::Mh;
+use std::ptr::null_mut;
+
+#[repr(C)]
+pub struct ModuleGlobals<T: 'static> {
+    inner: UnsafeCell<T>,
+}
+
+impl<T: 'static> ModuleGlobals<T> {
+    pub const fn new(inner: T) -> Self {
+        Self { inner: UnsafeCell::new(inner) }
+    }
+
+    pub const fn get(&self) -> *mut T {
+        self.inner.get()
+    }
+
+    pub const fn create_ini_entry_def(&'static self, name: &str, default_value: &str, on_modify: Option<Mh>, modifiable: u32) -> zend_ini_entry_def {
+        zend_ini_entry_def {
+            name: name.as_ptr().cast(),
+            on_modify,
+            mh_arg1: 0 as *mut _,
+            mh_arg2: self.get().cast(),
+            mh_arg3: null_mut(),
+            value: default_value.as_ptr().cast(),
+            displayer: None,
+            modifiable: modifiable as c_int,
+            name_length: name.len() as u32,
+            value_length: default_value.len() as u32,
+        }
+    }
+}
+
+unsafe impl<T: 'static> Sync for ModuleGlobals<T> {}
 
 pub struct FunctionEntries<const N: usize> {
     inner: UnsafeCell<[zend_function_entry; N]>,
diff --git a/phper/src/zend/exceptions.rs b/phper/src/zend/exceptions.rs
@@ -0,0 +1,7 @@
+pub trait Throwable {
+
+}
+
+pub struct MyException;
+
+impl Throwable for MyException {}
diff --git a/phper/src/zend/ini.rs b/phper/src/zend/ini.rs
@@ -1,5 +1,14 @@
 use crate::sys::zend_ini_entry_def;
 use std::cell::UnsafeCell;
+use std::os::raw::{c_int, c_void};
+use crate::sys::{zend_ini_entry, zend_string};
+use std::mem::{transmute, size_of};
+
+pub type Mh = unsafe extern "C" fn(*mut zend_ini_entry, *mut zend_string, *mut c_void, *mut c_void, *mut c_void, c_int) -> c_int;
+
+pub const fn ini_entry_def_end() -> zend_ini_entry_def {
+    unsafe { transmute([0u8; size_of::<zend_ini_entry_def>()]) }
+}
 
 pub struct IniEntryDefs<const N: usize> {
     inner: UnsafeCell<[zend_ini_entry_def; N]>,
@@ -17,3 +26,19 @@ impl<const N: usize> IniEntryDefs<N> {
 }
 
 unsafe impl<const N: usize> Sync for IniEntryDefs<N> {}
+
+struct Entry {
+    a: &'static str,
+    b: &'static str,
+}
+
+struct Entry2 {
+    a: &'static str,
+    b: &'static str,
+}
+
+const fn entry(e: Entry) -> Entry2 {
+    let a = e.a;
+    let b = e.b;
+    Entry2 { a, b }
+}
diff --git a/phper/src/zend/mod.rs b/phper/src/zend/mod.rs
@@ -1,5 +1,7 @@
 pub mod api;
 pub mod compile;
+pub mod exceptions;
 pub mod ini;
 pub mod modules;
+pub mod portability;
 pub mod types;
diff --git a/phper/src/zend/portability.rs b/phper/src/zend/portability.rs
diff --git a/phper/src/zend/types.rs b/phper/src/zend/types.rs
@@ -1,6 +1,11 @@
-use crate::sys::{zend_execute_data, zval, zend_type, phper_zval_get_type, IS_STRING, IS_NULL, IS_TRUE, IS_FALSE, phper_zval_stringl};
+use crate::sys::{zend_execute_data, zval, zend_type, phper_zval_get_type, IS_STRING, IS_NULL,
+                 IS_TRUE, IS_FALSE, phper_zval_stringl, zend_throw_exception
+};
+use crate::c_str_ptr;
 use std::ffi::CStr;
 use std::borrow::Cow;
+use crate::zend::exceptions::Throwable;
+use std::ptr::{null, null_mut};
 
 pub struct ExecuteData {
     raw: *mut zend_execute_data,
@@ -31,6 +36,10 @@ impl ExecuteData {
             phper_zval_get_type(self.get_this()).into()
         }
     }
+
+    pub fn parse_parameters(&self) {
+
+    }
 }
 
 #[repr(u32)]
@@ -119,6 +128,30 @@ impl SetVal for String {
     }
 }
 
+impl<T: SetVal> SetVal for Option<T> {
+    fn set_val(self, val: &mut Val) {
+        unsafe {
+            match self {
+                Some(t) => t.set_val(val),
+                None => ().set_val(val),
+            }
+        }
+    }
+}
+
+impl<T: SetVal, E: Throwable> SetVal for Result<T, E> {
+    fn set_val(self, val: &mut Val) {
+        match self {
+            Ok(t) => t.set_val(val),
+            Err(e) => {
+                unsafe {
+                    zend_throw_exception(null_mut(), c_str_ptr!("Fuck"), 0);
+                }
+            }
+        }
+    }
+}
+
 pub enum Value<'a> {
     Null,
     Bool(bool),

Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,3 @@ pub fn php_rshutdown_function(_attr: TokenStream, input: TokenStream) -> TokenSt`
`99`	`99`	`pub fn php_minfo_function(_attr: TokenStream, input: TokenStream) -> TokenStream {`
`100`	`100`	`info_fn(input, "zm_info_")`
`101`	`101`	`}`
`102`		`-`