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

Refactor Code: Change Approach to emit necessary code for pointer params.

Browse source 
Use in typemap.
This commit is contained in:
Nihal 2017-07-11 08:13:40 +05:30
commit 4458040975
2 changed files with 66 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/php/php.swg
View file

@ -85,9 +85,14 @@
/* Object passed by value. Convert to a pointer */
%typemap(in) SWIGTYPE ($&1_ltype tmp)
%{
$arg2if (SWIG_ConvertPtr(&$input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL)
$arg2SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
$arg2$1 = *tmp;
if (zend_lookup_class(zend_string_init("$lower_param",sizeof("$lower_param")-1,0))) {
$1 = *$obj_value;
}
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");
$1 = *tmp;
}
%}
%typemap(directorout) SWIGTYPE ($&1_ltype tmp)
@ -103,8 +108,13 @@
%typemap(in) SWIGTYPE *,
SWIGTYPE []
%{
$arg2if (SWIG_ConvertPtr(&$input, (void **) &$1, $1_descriptor, 0) < 0)
$arg2SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $1_descriptor");
if (zend_lookup_class(zend_string_init("$lower_param",sizeof("$lower_param")-1,0))) {
$1 = $obj_value;
}
else {
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");
}
%}
%typemap(in) SWIGTYPE &

88
Source/Modules/php.cxx
View file

@ -1178,35 +1178,6 @@ public:
SwigType *pt = Getattr(p, "type");
bool decrement = false;
if (i == 0 && class_name)
decrement = true;
String *paramType = SwigType_str(pt, 0);
String *paramType_class = NULL;
bool paramType_valid = false;
int param_number = i;
if (class_name)
param_number-=2;
if (param_number < 0)
param_number++;
if (Strchr(paramType,'*')) {
paramType_class = NewString(paramType);
Replace(paramType_class,"*","",DOH_REPLACE_FIRST);
Chop(paramType_class);
paramType_valid = is_class(paramType_class) & (!decrement);
if (paramType_valid)
Printf(f->code, "arg%d = Z_%(upper)s_OBJ_P(&args[%d])->%s_obj;\n",i+1,paramType_class,param_number,paramType_class);
}
else if (is_class(pt)) {
paramType_class = NewString(paramType);
Chop(paramType_class);
Printf(f->code, "arg%d = *Z_%(upper)s_OBJ_P(&args[%d])->%s_obj;\n",i+1,paramType_class,param_number,paramType_class);
paramType_valid = true;
}
if (wrapperType == directorconstructor) {
source = NewStringf("args[%d]", i+1);
} else if (wrapperType == memberfn || wrapperType == membervar) {
@ -1219,17 +1190,56 @@ public:
/* Check if optional */
if (i >= num_required) {
Printf(f->code, "\tif(arg_count > %d) {\n", i);
Printf(f->code, "\tif(arg_count > %d) {\n", i);
}
String *paramType = SwigType_str(pt, 0);
String *paramType_class = NULL;
String *paramType_class_upper = NULL;
bool paramType_valid = is_class(pt);
if (Strchr(paramType,'*') || Strchr(paramType,'&')) {
paramType_class = NewString(paramType);
Replace(paramType_class,"*","",DOH_REPLACE_FIRST);
Replace(paramType_class,Strchr(paramType,' '),"",DOH_REPLACE_FIRST);
Chop(paramType_class);
paramType_class_upper = NewStringEmpty();
Printf(paramType_class_upper, "%(upper)s", paramType_class);
}
else if (paramType_valid) {
paramType_class = NewString(paramType);
Chop(paramType_class);
paramType_class_upper = NewStringEmpty();
Printf(paramType_class_upper, "%(upper)s", paramType_class);
}
if ((tm = Getattr(p, "tmap:in"))) {
Replaceall(tm, "$source", &source);
Replaceall(tm, "$target", ln);
Replaceall(tm, "$input", source);
if (decrement || paramType_valid)
Replaceall(tm, "$arg2", "//");
else
Replaceall(tm, "$arg2", "");
if (Cmp(source,"args[-1]") == 0) {
Replaceall(tm, "$uinput", "getThis()");
Replaceall(tm, "$linput", "args[0]"); // Adding this to compile. It won't reach the generated if clause.
}
else {
Replaceall(tm, "$linput", source);
Replaceall(tm, "$uinput", "args[0]"); // Adding this to compile. It won't reach the generated if clause.
}
Replaceall(tm, "$input", source);
if (paramType_valid) {
String *param_value = NewStringEmpty();
String *param_zval = NewStringEmpty();
if (class_name)
Printf(param_zval, "getThis()");
else
Printf(param_zval, "&%s", source);
Printf(param_value, "Z_%(upper)s_OBJ_P(%s)->%s_obj", paramType_class_upper, param_zval , paramType_class);
Replaceall(tm, "$obj_value", param_value);
}
String *temp_obj = NewStringEmpty();
Printf(temp_obj, "&%s", ln);
Replaceall(tm, "$obj_value", SwigType_ispointer(pt) ? "NULL" : temp_obj); // Adding this to compile. It won't reach this if $obj_val is required.
Replaceall(tm, "$upper_param", paramType_class_upper);
Replaceall(tm, "$lower_param", paramType_class);
Setattr(p, "emit:input", source);
Printf(f->code, "%s\n", tm);
if (i == 0 && Getattr(p, "self")) {
@ -1302,7 +1312,7 @@ public:
String *retType = SwigType_str(d, 0);
String *retType_class = NULL;
String *retType_class_upper = NULL;
bool retType_valid = false;
bool retType_valid = is_class(d);
if (Strchr(retType,'*')) {
retType_class = NewString(retType);
@ -1310,11 +1320,15 @@ public:
Replace(retType_class,"*","",DOH_REPLACE_FIRST);
Chop(retType_class);
Printf(retType_class_upper, "%(upper)s",retType_class);
retType_valid = is_class(retType_class);
if (retType_valid)
Printf(f->code, "\nstruct %s_object *obj;\n",retType_class);
}
else if (retType_valid) {
retType_class = NewString(retType);
Chop(retType_class);
Printf(f->code, "\nstruct %s_object *obj = NULL;\n",retType_class);
}
/* emit function call */
String *actioncode = emit_action(n);