From: <wsf...@us...> - 2010-03-17 19:35:51
|
Revision: 11949 http://swig.svn.sourceforge.net/swig/?rev=11949&view=rev Author: wsfulton Date: 2010-03-17 19:35:45 +0000 (Wed, 17 Mar 2010) Log Message: ----------- Fix nspace when no -namespace is used (for C#) Modified Paths: -------------- trunk/Source/Modules/csharp.cxx Modified: trunk/Source/Modules/csharp.cxx =================================================================== --- trunk/Source/Modules/csharp.cxx 2010-03-16 22:20:41 UTC (rev 11948) +++ trunk/Source/Modules/csharp.cxx 2010-03-17 19:35:45 UTC (rev 11949) @@ -3261,15 +3261,13 @@ * ----------------------------------------------------------------------------- */ void addOpenNamespace(const String *nspace, File *file) { - if (namespce) { - if (namespce || nspace) { - Printf(file, "namespace "); - if (namespce) - Printv(file, namespce, nspace ? "." : "", NIL); - if (nspace) - Printv(file, nspace, NIL); - Printf(file, " {\n"); - } + if (namespce || nspace) { + Printf(file, "namespace "); + if (namespce) + Printv(file, namespce, nspace ? "." : "", NIL); + if (nspace) + Printv(file, nspace, NIL); + Printf(file, " {\n"); } } @@ -3278,9 +3276,8 @@ * ----------------------------------------------------------------------------- */ void addCloseNamespace(const String *nspace, File *file) { - if (namespce) - if (namespce || nspace) - Printf(file, "\n}\n"); + if (namespce || nspace) + Printf(file, "\n}\n"); } /* ----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2010-12-07 20:12:23
|
Revision: 12325 http://swig.svn.sourceforge.net/swig/?rev=12325&view=rev Author: wsfulton Date: 2010-12-07 20:12:17 +0000 (Tue, 07 Dec 2010) Log Message: ----------- Remove bad usage of a String rather than SwigType for csharp directors Modified Paths: -------------- trunk/Source/Modules/csharp.cxx Modified: trunk/Source/Modules/csharp.cxx =================================================================== --- trunk/Source/Modules/csharp.cxx 2010-12-07 20:03:47 UTC (rev 12324) +++ trunk/Source/Modules/csharp.cxx 2010-12-07 20:12:17 UTC (rev 12325) @@ -3641,17 +3641,13 @@ if (ctypeout) 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"); @@ -3716,24 +3712,13 @@ p = Getattr(p, "tmap:directorin:next"); - Delete(desc_tm); } else { - if (!desc_tm) { - Swig_warning(WARN_CSHARP_TYPEMAP_CSDIRECTORIN_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_CSHARP_TYPEMAP_CSDIRECTORIN_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_CSHARP_TYPEMAP_CSDIRECTORIN_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_CSHARP_TYPEMAP_CTYPE_UNDEF, input_file, line_number, "No ctype typemap defined for %s for use in %s::%s (skipping director method)\n", SwigType_str(pt, 0), SwigType_namestr(c_classname), SwigType_namestr(name)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2012-08-05 16:17:38
|
Revision: 13522 http://swig.svn.sourceforge.net/swig/?rev=13522&view=rev Author: wsfulton Date: 2012-08-05 16:17:32 +0000 (Sun, 05 Aug 2012) Log Message: ----------- Fix incorrect object deletion in C# module Modified Paths: -------------- trunk/Source/Modules/csharp.cxx Modified: trunk/Source/Modules/csharp.cxx =================================================================== --- trunk/Source/Modules/csharp.cxx 2012-08-05 16:16:23 UTC (rev 13521) +++ trunk/Source/Modules/csharp.cxx 2012-08-05 16:17:32 UTC (rev 13522) @@ -3655,8 +3655,6 @@ if (!ignored_method) Printf(w->code, "%s\n", tm); - Delete(tm); - /* Add C type to callback typedef */ if (i > 0) Printf(callback_typedef_parms, ", "); @@ -3788,7 +3786,6 @@ Printf(callback_code, " return %s;\n", tm); } - Delete(tm); Delete(tp); } else Printf(callback_code, " %s;\n", upcall); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wsf...@us...> - 2012-11-19 19:42:24
|
Revision: 13910 http://swig.svn.sourceforge.net/swig/?rev=13910&view=rev Author: wsfulton Date: 2012-11-19 19:42:17 +0000 (Mon, 19 Nov 2012) Log Message: ----------- Add some assertions to ensure NULL pointer is not used Modified Paths: -------------- trunk/Source/Modules/csharp.cxx Modified: trunk/Source/Modules/csharp.cxx =================================================================== --- trunk/Source/Modules/csharp.cxx 2012-11-19 19:41:12 UTC (rev 13909) +++ trunk/Source/Modules/csharp.cxx 2012-11-19 19:42:17 UTC (rev 13910) @@ -2328,6 +2328,7 @@ // Get the C# variable type - obtained differently depending on whether a setter is required. String *variable_type = return_type; if (setter_flag) { + assert(last_parm); p = last_parm; // (last parameter is the only parameter for properties) SwigType *pt = Getattr(p, "type"); if ((tm = Getattr(p, "tmap:cstype"))) { @@ -2350,6 +2351,7 @@ if (setter_flag) { // Setter method + assert(last_parm); p = last_parm; // (last parameter is the only parameter for properties) SwigType *pt = Getattr(p, "type"); if ((tm = Getattr(p, "tmap:csvarin"))) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |