jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[php] Add parentheses around $value when casting

Browse source 
In some cases $value can be an expression without parentheses around
it, and we want to cast the result of the whole expression.
This commit is contained in:
Olly Betts 2022-07-27 08:49:15 +12:00
commit b57248cc1a
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/php/const.i
View file

@ -12,11 +12,11 @@
unsigned char, unsigned char,
signed char, signed char,
enum SWIGTYPE %{ enum SWIGTYPE %{
zend_declare_class_constant_long(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, ($1_type)$value); zend_declare_class_constant_long(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, ($1_type)($value));
%} %}
%typemap(classconsttab) bool %{ %typemap(classconsttab) bool %{
zend_declare_class_constant_bool(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, ($1_type)$value); zend_declare_class_constant_bool(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, ($1_type)($value));
%} %}
%typemap(classconsttab) float, %typemap(classconsttab) float,
@ -48,7 +48,7 @@
{ {
zval z; zval z;
ZVAL_UNDEF(&z); ZVAL_UNDEF(&z);
SWIG_SetPointerZval(&z, (void*)$value, $1_descriptor, 0); SWIG_SetPointerZval(&z, (void*)($value), $1_descriptor, 0);
zval_copy_ctor(&z); zval_copy_ctor(&z);
zend_declare_class_constant(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, &z); zend_declare_class_constant(SWIG_Php_ce_$class, "$const_name", sizeof("$const_name") - 1, &z);
} }
@ -65,10 +65,10 @@
unsigned char, unsigned char,
signed char, signed char,
enum SWIGTYPE enum SWIGTYPE
"SWIG_LONG_CONSTANT($symname, ($1_type)$value);"; "SWIG_LONG_CONSTANT($symname, ($1_type)($value));";
%typemap(consttab) bool %typemap(consttab) bool
"SWIG_BOOL_CONSTANT($symname, ($1_type)$value);"; "SWIG_BOOL_CONSTANT($symname, ($1_type)($value));";
%typemap(consttab) float, %typemap(consttab) float,
double double
@ -92,7 +92,7 @@
SWIGTYPE [] { SWIGTYPE [] {
zend_constant c; zend_constant c;
ZVAL_UNDEF(&c.value); ZVAL_UNDEF(&c.value);
SWIG_SetPointerZval(&c.value, (void*)$value, $1_descriptor, 0); SWIG_SetPointerZval(&c.value, (void*)($value), $1_descriptor, 0);
zval_copy_ctor(&c.value); zval_copy_ctor(&c.value);
c.name = zend_string_init("$symname", sizeof("$symname") - 1, 0); c.name = zend_string_init("$symname", sizeof("$symname") - 1, 0);
SWIG_ZEND_CONSTANT_SET_FLAGS(&c, CONST_CS, module_number); SWIG_ZEND_CONSTANT_SET_FLAGS(&c, CONST_CS, module_number);