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

[PHP5] Fix extra code added to proxy class constructors in the case

Browse source 
where the only constructor takes no arguments.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10863 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2008-09-18 13:01:52 +00:00
commit 6029bc8b2d
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -1,6 +1,10 @@
Version 1.3.37 (in progress) Version 1.3.37 (in progress)
============================= =============================
2008-09-18: olly
[PHP5] Fix extra code added to proxy class constructors in the case
where the only constructor takes no arguments.
2008-09-18: olly 2008-09-18: olly
[PHP5] Fix wrapping of a renamed enumerated value of an enum class [PHP5] Fix wrapping of a renamed enumerated value of an enum class
member (SF#2095273). member (SF#2095273).

20
Source/Modules/php.cxx
View file

@ -1358,16 +1358,26 @@ public:
Printf(output, "\n"); Printf(output, "\n");
// If it's a member function or a class constructor... // If it's a member function or a class constructor...
if (wrapperType == memberfn || (newobject && current_class)) { if (wrapperType == memberfn || (newobject && current_class)) {
Printf(output, "\tfunction %s(%s) {\n", methodname, args);
// We don't need this code if the wrapped class has a copy ctor // We don't need this code if the wrapped class has a copy ctor
// since the flat function new_CLASSNAME will handle it for us. // since the flat function new_CLASSNAME will handle it for us.
if (newobject && !Getattr(current_class, "allocate:copy_constructor")) { if (newobject && !Getattr(current_class, "allocate:copy_constructor")) {
const char * arg0;
if (max_num_of_arguments > 0) {
arg0 = Char(arg_names[0]);
} else {
arg0 = "res";
Delete(args);
args = NewString("$res=null");
}
SwigType *t = Getattr(current_class, "classtype"); SwigType *t = Getattr(current_class, "classtype");
String *mangled_type = SwigType_manglestr(SwigType_ltype(t)); String *mangled_type = SwigType_manglestr(SwigType_ltype(t));
Printf(s_oowrappers, "\t\tif (is_resource($%s) && get_resource_type($%s) == \"_p%s\") {\n", arg_names[0], arg_names[0], mangled_type); Printf(output, "\tfunction %s(%s) {\n", methodname, args);
Printf(s_oowrappers, "\t\t\t$this->%s=$%s;\n", SWIG_PTR, arg_names[0]); Printf(output, "\t\tif (is_resource($%s) && get_resource_type($%s) == \"_p%s\") {\n", arg0, arg0, mangled_type);
Printf(s_oowrappers, "\t\t\treturn;\n"); Printf(output, "\t\t\t$this->%s=$%s;\n", SWIG_PTR, arg0);
Printf(s_oowrappers, "\t\t}\n"); Printf(output, "\t\t\treturn;\n");
Printf(output, "\t\t}\n");
} else {
Printf(output, "\tfunction %s(%s) {\n", methodname, args);
} }
} else { } else {
Printf(output, "\tstatic function %s(%s) {\n", methodname, args); Printf(output, "\tstatic function %s(%s) {\n", methodname, args);