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

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

Revision: 12330
          http://swig.svn.sourceforge.net/swig/?rev=12330&view=rev
Author:   wsfulton
Date:     2010-12-07 21:15:05 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
Remove bad usage of a String rather than SwigType for D directors

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

Modified: trunk/Source/Modules/d.cxx
===================================================================
--- trunk/Source/Modules/d.cxx	2010-12-07 20:44:48 UTC (rev 12329)
+++ trunk/Source/Modules/d.cxx	2010-12-07 21:15:05 UTC (rev 12330)
@@ -2033,17 +2033,13 @@
 	  c_param_type = ctypeout;
 	}
 
-	Parm *tp = NewParm(c_param_type, empty_str, n);
-	String *desc_tm = NULL;
-
 	/* Add to local variables */
 	Printf(c_decl, "%s %s", c_param_type, arg);
 	if (!ignored_method)
 	  Wrapper_add_localv(w, arg, c_decl, (!(SwigType_ispointer(pt) || SwigType_isreference(pt)) ? "" : "= 0"), NIL);
 
 	/* Add input marshalling code */
-	if ((desc_tm = Swig_typemap_lookup("directorin", tp, "", 0))
-	    && (tm = Getattr(p, "tmap:directorin"))) {
+	if ((tm = Getattr(p, "tmap:directorin"))) {
 
 	  Replaceall(tm, "$input", arg);
 	  Replaceall(tm, "$owner", "0");
@@ -2068,7 +2064,7 @@
 	    }
 	    const String *im_directorinattributes = Getattr(p, "tmap:imtype:directorinattributes");
 
-      // TODO: Is this copy really needed?
+	    // TODO: Is this copy really needed?
 	    String *din = Copy(lookupDTypemap(p, "ddirectorin", true));
 
 	    if (din) {
@@ -2087,7 +2083,7 @@
 		Printv(imcall_args, ln, NIL);
 	      }
 
-        Delete(din);
+	      Delete(din);
 
 	      // Get the parameter type in the proxy D class (used later when
 	      // generating the overload checking code for the directorConnect
@@ -2112,25 +2108,13 @@
 	  }
 
 	  p = Getattr(p, "tmap:directorin:next");
-
-	  Delete(desc_tm);
 	} else {
-	  if (!desc_tm) {
-	    Swig_warning(WARN_D_TYPEMAP_DDIRECTORIN_UNDEF, input_file, line_number,
-	      "No or improper directorin typemap defined for %s for use in %s::%s (skipping director method)\n",
-	      SwigType_str(c_param_type, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    p = nextSibling(p);
-	  } else if (!tm) {
-	    Swig_warning(WARN_D_TYPEMAP_DDIRECTORIN_UNDEF, input_file, line_number,
-	      "No or improper directorin typemap defined for argument %s for use in %s::%s (skipping director method)\n",
-	      SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
-	    p = nextSibling(p);
-	  }
-
+	  Swig_warning(WARN_D_TYPEMAP_DDIRECTORIN_UNDEF, input_file, line_number,
+	    "No or improper directorin typemap defined for argument %s for use in %s::%s (skipping director method)\n",
+	    SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name));
+	  p = nextSibling(p);
 	  output_director = false;
 	}
-
-	Delete(tp);
       } else {
 	Swig_warning(WARN_D_TYPEMAP_CTYPE_UNDEF, input_file, line_number,
 	  "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n",


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