jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Interface feature fix for typedef types

Browse source
This commit is contained in:
William S Fulton 2016-03-07 21:39:53 +00:00
commit 5117c77d4a
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Modules/interface.cxx
View file

@ -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);
}