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

Bug Fix Director upcall functions to return object pointers

Browse source 
- Refactor php.swg to adhere to checkstyle
This commit is contained in:
Nihal 2017-09-03 10:29:18 +05:30
commit f054f76544
2 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Lib/php/php.swg
View file

@ -87,8 +87,7 @@
%{ %{
if ($needNewFlow) { if ($needNewFlow) {
$1 = *(($1_ltype *)$obj_value); $1 = *(($1_ltype *)$obj_value);
} } else {
else {
if (SWIG_ConvertPtr(&$input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL) if (SWIG_ConvertPtr(&$input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL)
SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1&_descriptor"); SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1&_descriptor");
$1 = *tmp; $1 = *tmp;
@ -99,9 +98,16 @@
%{ %{
/* If exit was via exception, PHP NULL is returned so skip the conversion. */ /* If exit was via exception, PHP NULL is returned so skip the conversion. */
if (!EG(exception)) { if (!EG(exception)) {
if (SWIG_ConvertPtr($input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL) if ($needNewFlow) {
SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor"); swig_object_wrapper *obj = SWIG_Z_FETCH_OBJ_P(result);
$result = *tmp; tmp = ($&1_ltype) &obj->ptr;
c_result = *tmp;
obj->newobject = 0;
} else {
if (SWIG_ConvertPtr($input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL)
SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
$result = *tmp;
}
} }
%} %}
@ -110,8 +116,7 @@
%{ %{
if ($needNewFlow) { if ($needNewFlow) {
$1 = ($1_ltype) $obj_value; $1 = ($1_ltype) $obj_value;
} } else {
else {
if (SWIG_ConvertPtr(&$linput, (void **) &$1, $1_descriptor, 0) < 0) if (SWIG_ConvertPtr(&$linput, (void **) &$1, $1_descriptor, 0) < 0)
SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor"); SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
} }
@ -121,8 +126,7 @@
%{ %{
if ($needNewFlow) { if ($needNewFlow) {
$1 = ($1_ltype) $obj_value; $1 = ($1_ltype) $obj_value;
} } else {
else {
if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0 || $1 == NULL) if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0 || $1 == NULL)
SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor"); SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
} }
@ -132,8 +136,7 @@
%{ %{
if ($needNewFlow) { if ($needNewFlow) {
$1 = ($1_ltype) $obj_value; $1 = ($1_ltype) $obj_value;
} } else {
else {
if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0 || $1 == NULL) { if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0 || $1 == NULL) {
SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor"); SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
} }
@ -144,8 +147,7 @@
%{ %{
if ($needNewFlow) { if ($needNewFlow) {
$1 = ($1_ltype) $obj_value; $1 = ($1_ltype) $obj_value;
} } else {
else {
if (SWIG_ConvertPtr(&$input, (void **) &temp, $*1_descriptor, 0) < 0) { if (SWIG_ConvertPtr(&$input, (void **) &temp, $*1_descriptor, 0) < 0) {
SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $*1_descriptor"); SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $*1_descriptor");
} }
@ -158,8 +160,7 @@
if ($needNewFlow) { if ($needNewFlow) {
SWIG_Z_FETCH_OBJ_P(&$input)->newobject = 0; SWIG_Z_FETCH_OBJ_P(&$input)->newobject = 0;
$1 = ($lower_param *)SWIG_Z_FETCH_OBJ_P(&$input)->ptr; $1 = ($lower_param *)SWIG_Z_FETCH_OBJ_P(&$input)->ptr;
} } else {
else {
if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, SWIG_POINTER_DISOWN ) < 0) if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, SWIG_POINTER_DISOWN ) < 0)
SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor"); SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
} }

1
Source/Modules/php.cxx
View file

@ -3520,6 +3520,7 @@ done:
char temp[24]; char temp[24];
sprintf(temp, "%d", idx); sprintf(temp, "%d", idx);
Replaceall(tm, "$argnum", temp); Replaceall(tm, "$argnum", temp);
Replaceall(tm, "$needNewFlow", "1");
/* TODO check this */ /* TODO check this */
if (Getattr(n, "wrap:disown")) { if (Getattr(n, "wrap:disown")) {