[Swig-cvs] SF.net SVN: swig:[11466] trunk/Source/Modules/php.cxx

[<vm...@us...>]

Revision: 11466
          http://swig.svn.sourceforge.net/swig/?rev=11466&view=rev
Author:   vmiklos
Date:     2009-07-29 11:03:22 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
PHP: Avoid calling is_resource() twice with no good reason

Modified Paths:
--------------
    trunk/Source/Modules/php.cxx

Modified: trunk/Source/Modules/php.cxx
===================================================================
--- trunk/Source/Modules/php.cxx	2009-07-29 03:34:22 UTC (rev 11465)
+++ trunk/Source/Modules/php.cxx	2009-07-29 11:03:22 UTC (rev 11466)
@@ -1633,8 +1633,10 @@
 	     * _p_Foo -> Foo, _p_ns__Bar -> Bar
 	     * TODO: do this in a more elegant way
 	     */
-	    Printf(output, "\t\tif (is_resource($r)) $class='%s'.substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));\n", prefix);
-	    Printf(output, "\t\treturn is_resource($r) ? new $class($r) : $r;\n");
+	    Printf(output, "\t\tif (is_resource($r)) {\n");
+	    Printf(output, "\t\t\t$class='%s'.substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));\n", prefix);
+	    Printf(output, "\t\t\treturn new $class($r);\n\t\t}\n");
+	    Printf(output, "\t\telse return $r;\n");
 	  } else {
 	    Printf(output, "\t\t$this->%s = $r;\n", SWIG_PTR);
 	    Printf(output, "\t\treturn $this;\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.