Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions crates/macros-rs/src/zpp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,22 @@ macro_rules! __impl__ZEND_PARSE_ARGS {
$crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "f!" ] [ $( $args )* ] )
};
( @make_spec [ $( $p:expr )+ ] [ Z_PARAM_LONG( $v:expr ) $( $args:tt )* ] ) => {
$crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "l" ] [ $( $args )* ])
{
// Force the correct type, the inferred i32 might be a different size
// than the expected zend_long, leading to the next parameter overwriting
// this one
let _type_check: rsphp_sys::zend_long = $v;
$crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "l" ] [ $( $args )* ])
}
};
( @make_spec [ $( $p:expr )+ ] [ Z_PARAM_LONG_OR_NULL( $v1:expr, $v2:expr ) $( $args:tt )* ] ) => {
$crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "l!" ] [ $( $args )* ])
{
// Force the correct type, the inferred i32 might be a different size
// than the expected zend_long, leading to the next parameter overwriting
// this one
let _type_check: rsphp_sys::zend_long = $v1;
$crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "l!" ] [ $( $args )* ])
}
};
( @make_spec [ $( $p:expr )+ ] [ Z_PARAM_DOUBLE( $v:expr ) $( $args:tt )* ] ) => {
$crate::__impl__ZEND_PARSE_ARGS!(@make_spec [ $( $p )+ "d" ] [ $( $args )* ])
Expand Down
11 changes: 7 additions & 4 deletions example/rust-ext-demo/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ use rsphp_macros_rs::{ZEND_FE, ZEND_PARSE_ARGS, ZEND_PARSE_PARAMETERS_NONE};
use rsphp_sys::{
HashTable, ZEND_CALL_HAS_EXTRA_NAMED_PARAMS, ZEND_RESULT_CODE, display_ini_entries,
php_output_write, php_printf, php_var_dump, zend_class_entry, zend_execute_data,
zend_function_entry, zend_module_entry, zend_parse_parameters, zend_register_ini_entries_ex,
zend_result, zend_string, zend_string_init, zend_unregister_ini_entries_ex, zval,
zend_function_entry, zend_long, zend_module_entry, zend_parse_parameters,
zend_register_ini_entries_ex, zend_result, zend_string, zend_string_init,
zend_unregister_ini_entries_ex, zval,
};
use std::ffi::{c_char, c_int};

Expand Down Expand Up @@ -200,11 +201,13 @@ extern "C" fn dump_named_variadic_args(
}
}
extern "C" fn zpp_testing(execute_data: *mut zend_execute_data, return_value: *mut zval) {
// Types are needed to make sure that integer sizes are correct, otherwise
// rust will use 4 bytes for the long, but php expects 8 bytes
let mut bool_val = true;
let mut nullable_bool_val = true;
let mut nullable_bool_null = false;
let mut long_val = 1;
let mut nullable_long_val = 1;
let mut long_val: zend_long = 1;
let mut nullable_long_val: zend_long = 1;
let mut nullable_long_null = false;
let mut double_val = 1.0;
let mut nullable_double_val = 1.0;
Expand Down
64 changes: 32 additions & 32 deletions example/rust-ext-demo/tests/zpp.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@ string(107) "bool=true, ?bool=false, long=1, ?long=9, double=3.14, ?double=null,
string(107) "bool=true, ?bool=false, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(96) "bool=true, ?bool=false, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(96) "bool=true, ?bool=false, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(104) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(104) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(93) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=null"
string(93) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=null"
string(108) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z"
string(108) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z"
string(97) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=null"
string(97) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=null"
string(103) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z"
string(103) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z"
string(92) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=null"
string(92) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=null"
string(107) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(107) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(96) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(96) "bool=true, ?bool=false, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(107) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(107) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(96) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=null"
string(96) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=null"
string(111) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z"
string(111) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z"
string(100) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=null"
string(100) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=null"
string(106) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z"
string(106) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z"
string(95) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=null"
string(95) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=null"
string(110) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(110) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(99) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(99) "bool=true, ?bool=false, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(103) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(103) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(92) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=12.34, string=foo, ?string=null"
Expand All @@ -96,21 +96,21 @@ string(106) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=null,
string(106) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(95) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(95) "bool=true, ?bool=null, long=1, ?long=9, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(103) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(103) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(92) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=null"
string(92) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=foo, ?string=null"
string(107) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z"
string(107) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z"
string(96) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=null"
string(96) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=12.34, string=baz%0qux, ?string=null"
string(102) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z"
string(102) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z"
string(91) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=null"
string(91) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=foo, ?string=null"
string(106) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(106) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(95) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(95) "bool=true, ?bool=null, long=1, ?long=0, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(106) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(106) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=fizz%0b�uz�z"
string(95) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=null"
string(95) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=foo, ?string=null"
string(110) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z"
string(110) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=fizz%0b�uz�z"
string(99) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=null"
string(99) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=12.34, string=baz%0qux, ?string=null"
string(105) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z"
string(105) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=fizz%0b�uz�z"
string(94) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=null"
string(94) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=foo, ?string=null"
string(109) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(109) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=fizz%0b�uz�z"
string(98) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=null"
string(98) "bool=true, ?bool=null, long=1, ?long=null, double=3.14, ?double=null, string=baz%0qux, ?string=null"
array(0) {
}
Loading