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

Fix OUTPUT Typemap not having return statement bug in PHP wrapper.

Browse source
This commit is contained in:
Nihal 2017-06-27 10:37:07 +05:30 • committed by Olly Betts
commit 251d25346d
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -7,6 +7,10 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
Version 4.0.0 (in progress) Version 4.0.0 (in progress)
=========================== ===========================
2017-06-27: nihaln
[PHP] Update the OUTPUT Typemap to add return statement to the
PHP Wrapper.
2017-06-27: nihaln 2017-06-27: nihaln
[PHP] Update the enum and value examples to use the OO wrappers [PHP] Update the enum and value examples to use the OO wrappers
rather than the flat functions produced with -noproxy. There's rather than the flat functions produced with -noproxy. There's

2
Source/Modules/php.cxx
View file

@ -1841,7 +1841,7 @@ public:
Delete(wrapobj); Delete(wrapobj);
} }
} else { } else {
if (non_void_return) { if (non_void_return || hasargout) {
Printf(output, "\t\treturn %s;\n", invoke); Printf(output, "\t\treturn %s;\n", invoke);
} else if (Cmp(invoke, "$r") != 0) { } else if (Cmp(invoke, "$r") != 0) {
Printf(output, "\t\t%s;\n", invoke); Printf(output, "\t\t%s;\n", invoke);

2
Source/Modules/php5.cxx
View file

@ -1827,7 +1827,7 @@ public:
Delete(wrapobj); Delete(wrapobj);
} }
} else { } else {
if (non_void_return) { if (non_void_return || hasargout) {
Printf(output, "\t\treturn %s;\n", invoke); Printf(output, "\t\treturn %s;\n", invoke);
} else if (Cmp(invoke, "$r") != 0) { } else if (Cmp(invoke, "$r") != 0) {
Printf(output, "\t\t%s;\n", invoke); Printf(output, "\t\t%s;\n", invoke);