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

PHP: fix for the overload_rename testcase

Browse source 
Previously we just had two __construct function which resulted in a
parse error. Now we create a new factory method for the renamed ctor.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11510 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Miklos Vajna 2009-08-06 12:27:03 +00:00
commit 09b20003fb
2 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Examples/test-suite/php/overload_rename_runme.php Normal file
View file

@ -0,0 +1,19 @@
<?php
require "tests.php";
require "overload_rename.php";
// No new functions
check::functions(array());
// No new classes
check::classes(array(Foo));
// now new vars
check::globals(array());
$f = new Foo(1.0);
$f = new Foo(1.0,1.0);
$f = Foo::Foo_int(1.0,1);
$f = Foo::Foo_int(1.0,1,1.0);
check::done();
?>

14
Source/Modules/php.cxx
View file

@ -1026,7 +1026,13 @@ public:
String *output = s_oowrappers; String *output = s_oowrappers;
if (constructor) { if (constructor) {
class_has_ctor = true; class_has_ctor = true;
methodname = "__construct"; if (strcmp(GetChar(n, "name"), GetChar(n, "constructorHandler:sym:name")) == 0) {
methodname = "__construct";
} else {
// The class has multiple constructors and this one is
// renamed, so this will be a static factory function
methodname = GetChar(n, "constructorHandler:sym:name");
}
} else if (wrapperType == memberfn) { } else if (wrapperType == memberfn) {
methodname = Char(Getattr(n, "memberfunctionHandler:sym:name")); methodname = Char(Getattr(n, "memberfunctionHandler:sym:name"));
} else if (wrapperType == staticmemberfn) { } else if (wrapperType == staticmemberfn) {
@ -1585,7 +1591,11 @@ public:
Printf(output, "%s", prepare); Printf(output, "%s", prepare);
if (constructor) { if (constructor) {
if (!directorsEnabled() || !Swig_directorclass(n)) { if (!directorsEnabled() || !Swig_directorclass(n)) {
Printf(output, "\t\t$this->%s=%s;\n", SWIG_PTR, invoke); if (strcmp(methodname, "__construct") == 0) {
Printf(output, "\t\t$this->%s=%s;\n", SWIG_PTR, invoke);
} else {
Printf(output, "\t\treturn new %s(%s);\n", "Foo", invoke);
}
} else { } else {
Node *parent = Swig_methodclass(n); Node *parent = Swig_methodclass(n);
String *classname = Swig_class_name(parent); String *classname = Swig_class_name(parent);