From: <wsf...@us...> - 2012-11-23 07:38:11
|
Revision: 13932 http://swig.svn.sourceforge.net/swig/?rev=13932&view=rev Author: wsfulton Date: 2012-11-23 07:38:00 +0000 (Fri, 23 Nov 2012) Log Message: ----------- Remove some unused code and pointless variable assignments Modified Paths: -------------- trunk/Source/Modules/csharp.cxx trunk/Source/Modules/d.cxx trunk/Source/Modules/java.cxx trunk/Source/Modules/lang.cxx trunk/Source/Modules/octave.cxx trunk/Source/Modules/php.cxx trunk/Source/Modules/python.cxx trunk/Source/Modules/r.cxx trunk/Source/Modules/ruby.cxx Modified: trunk/Source/Modules/csharp.cxx =================================================================== --- trunk/Source/Modules/csharp.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/csharp.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -925,7 +925,7 @@ if ((throw_parm_list = Getattr(n, "catchlist"))) { Swig_typemap_attach_parms("throws", throw_parm_list, f); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { canThrow(n, "throws", p); } } @@ -3747,7 +3747,7 @@ if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); Modified: trunk/Source/Modules/d.cxx =================================================================== --- trunk/Source/Modules/d.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/d.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -1695,7 +1695,7 @@ if ((throw_parm_list = Getattr(n, "catchlist"))) { Swig_typemap_attach_parms("throws", throw_parm_list, f); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { canThrow(n, "throws", p); } } @@ -2224,7 +2224,7 @@ if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); Modified: trunk/Source/Modules/java.cxx =================================================================== --- trunk/Source/Modules/java.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/java.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -1016,7 +1016,7 @@ if ((throw_parm_list = Getattr(n, "catchlist"))) { Swig_typemap_attach_parms("throws", throw_parm_list, f); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { addThrows(n, "tmap:throws", p); } } @@ -3631,7 +3631,7 @@ SwigType *adjustedreturntype = covariant ? covariant : returntype; Parm *adjustedreturntypeparm = NewParmNode(adjustedreturntype, n); - if ((tm = Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0)) + if (Swig_typemap_lookup("directorin", adjustedreturntypeparm, "", 0) && (cdesc = Getattr(adjustedreturntypeparm, "tmap:directorin:descriptor"))) { // Note that in the case of polymorphic (covariant) return types, the @@ -3658,7 +3658,7 @@ } String *jdesc = NULL; - if ((tm = Swig_typemap_lookup("directorin", tp, "", 0)) + if (Swig_typemap_lookup("directorin", tp, "", 0) && (jdesc = Getattr(tp, "tmap:directorin:descriptor"))) { // Objects marshalled passing a Java class across JNI boundary use jobject - the nouse flag indicates this @@ -3911,7 +3911,7 @@ if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { addThrows(n, "tmap:throws", p); if (gencomma++) { Modified: trunk/Source/Modules/lang.cxx =================================================================== --- trunk/Source/Modules/lang.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/lang.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -1134,7 +1134,6 @@ int Language::callbackfunctionHandler(Node *n) { Swig_require("callbackfunctionHandler", n, "name", "*sym:name", "*type", "?value", NIL); - String *symname = Getattr(n, "sym:name"); String *type = Getattr(n, "type"); String *name = Getattr(n, "name"); String *parms = Getattr(n, "parms"); Modified: trunk/Source/Modules/octave.cxx =================================================================== --- trunk/Source/Modules/octave.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/octave.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -1319,7 +1319,7 @@ if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); Modified: trunk/Source/Modules/php.cxx =================================================================== --- trunk/Source/Modules/php.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/php.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -1177,11 +1177,6 @@ if (!o) { // This "overloaded method" is really just one with default args. really_overloaded = false; - if (l != full_parmlist) { - l = full_parmlist; - if (wrapperType == memberfn) - l = nextSibling(l); - } } } @@ -2472,7 +2467,7 @@ if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); Modified: trunk/Source/Modules/python.cxx =================================================================== --- trunk/Source/Modules/python.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/python.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -4583,7 +4583,7 @@ if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); Modified: trunk/Source/Modules/r.cxx =================================================================== --- trunk/Source/Modules/r.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/r.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -572,7 +572,7 @@ Parm *p = parms; for (i = 0; p; p = nextSibling(p), ++i) { String *arg = Getattr(p, "name"); - String *lname = NewString(""); + String *lname; if (!arg && Cmp(Getattr(p, "type"), "void")) { lname = NewStringf("s_arg%d", i+1); Modified: trunk/Source/Modules/ruby.cxx =================================================================== --- trunk/Source/Modules/ruby.cxx 2012-11-23 07:36:10 UTC (rev 13931) +++ trunk/Source/Modules/ruby.cxx 2012-11-23 07:38:00 UTC (rev 13932) @@ -737,10 +737,6 @@ String *autodoc = Getattr(n, "feature:autodoc"); autodoc_l dlevel = autodoc_level(autodoc); - symname = Getattr(n, "sym:name"); - if ( Getattr( special_methods, symname ) ) - symname = Getattr( special_methods, symname ); - switch (dlevel) { case NO_AUTODOC: case NAMES_AUTODOC: @@ -3093,7 +3089,7 @@ if (throw_parm_list) Swig_typemap_attach_parms("throws", throw_parm_list, 0); for (p = throw_parm_list; p; p = nextSibling(p)) { - if ((tm = Getattr(p, "tmap:throws"))) { + if (Getattr(p, "tmap:throws")) { if (gencomma++) { Append(w->def, ", "); Append(declaration, ", "); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |