Interface feature fix for typedef types

2 files changed, 25 insertions, 8 deletions

diff --git a/Examples/test-suite/multiple_inheritance_interfaces.i b/Examples/test-suite/multiple_inheritance_interfaces.i
index 9444f9dbf..2972922fb 100644
--- a/Examples/test-suite/multiple_inheritance_interfaces.i
+++ b/Examples/test-suite/multiple_inheritance_interfaces.i
@@ -49,3 +49,18 @@ struct U : R {};
 struct V : S {};
 struct W : T {};
 %}
+
+#if defined(SWIGJAVA) || defined(SWIGCSHARP)
+%interface_impl(BaseOverloaded);
+#endif
+%inline %{
+struct BaseOverloaded {
+  typedef P PTypedef;
+  virtual ~BaseOverloaded() {}
+  virtual void identical_overload(int i, const PTypedef &pp = PTypedef()) {}
+};
+
+struct DerivedOverloaded : public BaseOverloaded {
+  virtual void identical_overload(int i, const PTypedef &p = PTypedef()) {}
+};
+%}
diff --git a/Source/Modules/interface.cxx b/Source/Modules/interface.cxx
index 03d15a615..f6d4c955b 100644
--- a/Source/Modules/interface.cxx
+++ b/Source/Modules/interface.cxx
@@ -144,27 +144,29 @@ void Swig_interface_propagate_methods(Node *n) {
       if (!is_interface && GetFlag(mi.item, "abstract"))
 	continue;
       String *this_decl = Getattr(mi.item, "decl");
-      String *resolved_decl = SwigType_typedef_resolve_all(this_decl);
-      bool overloaded = false;
-      if (SwigType_isfunction(resolved_decl)) {
+      String *this_decl_resolved = SwigType_typedef_resolve_all(this_decl);
+      bool identically_overloaded_method = false; // true when a base class' method is implemented in n
+      if (SwigType_isfunction(this_decl_resolved)) {
 	String *name = Getattr(mi.item, "name");
 	for (Node *child = firstChild(n); child; child = nextSibling(child)) {
 	  if (Getattr(child, "interface:owner"))
 	    break; // at the end of the list are newly appended methods
 	  if (checkAttribute(child, "name", name)) {
 	    String *decl = SwigType_typedef_resolve_all(Getattr(child, "decl"));
-	    overloaded = Strcmp(decl, this_decl) == 0;
+	    identically_overloaded_method = Strcmp(decl, this_decl_resolved) == 0;
 	    Delete(decl);
-	    if (overloaded)
+	    if (identically_overloaded_method)
 	      break;
 	  }
 	}
       }
-      Delete(resolved_decl);
-      if (!overloaded)
+      Delete(this_decl_resolved);
+      if (!identically_overloaded_method) {
+	// TODO: Fix if the method is overloaded with different arguments / has default args
 	appendChild(n, mi.item);
-      else
+      } else {
 	Delete(mi.item);
+      }
     }
     Delete(methods);
   }