[Swig-cvs] SF.net SVN: swig: [9640] trunk

[<wsf...@us...>]

Revision: 9640
          http://swig.svn.sourceforge.net/swig/?rev=9640&view=rev
Author:   wsfulton
Date:     2007-01-12 15:41:49 -0800 (Fri, 12 Jan 2007)

Log Message:
-----------
add support for newfree typemaps in php module

Modified Paths:
--------------
    trunk/CHANGES.current
    trunk/Source/Modules/php4.cxx

Modified: trunk/CHANGES.current
===================================================================
--- trunk/CHANGES.current	2007-01-12 19:01:40 UTC (rev 9639)
+++ trunk/CHANGES.current	2007-01-12 23:41:49 UTC (rev 9640)
@@ -1,5 +1,9 @@
 Version 1.3.32 (in progress)
 ============================
+
+01/12/2007: wsfulton
+            [Php] Add support for newfree typemaps (sometimes used by %newobject)
+
 01/12/2007: beazley
             New command line option -macroerrors.   When supplied, this will force
             the C scanner/parser to report proper location information for code contained

Modified: trunk/Source/Modules/php4.cxx
===================================================================
--- trunk/Source/Modules/php4.cxx	2007-01-12 19:01:40 UTC (rev 9639)
+++ trunk/Source/Modules/php4.cxx	2007-01-12 23:41:49 UTC (rev 9640)
@@ -1254,11 +1254,22 @@
     if (cleanup) {
       Printv(f->code, cleanup, NIL);
     }
-    // What's this bit for?
+
+    /* Look to see if there is any newfree cleanup code */
+    if (GetFlag(n, "feature:new")) {
+      if ((tm = Swig_typemap_lookup_new("newfree", n, "result", 0))) {
+	Printf(f->code, "%s\n", tm);
+	Delete(tm);
+      }
+    }
+
+    /* See if there is any return cleanup code */
     if ((tm = Swig_typemap_lookup_new("ret", n, "result", 0))) {
       Printf(f->code, "%s\n", tm);
+      Delete(tm);
     }
 
+
     if (mvr) {
       if (!mvrset) {
 	Printf(f->code, "return _return_value;\n");


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