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

Order of interfaces generated for %interface macros

Browse source 
Ensure the order of interfaces generated in proxy interfaces for the
%interface family of macros is the same as that parsed from the bases in C++.
This commit is contained in:
William S Fulton 2022-07-20 19:46:08 +01:00
commit 7592722e39
5 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Modules/interface.cxx
View file

@ -29,10 +29,9 @@ static bool interface_feature_enabled = false;
static List *collect_interface_methods(Node *n) {
List *methods = NewList();
if (Hash *bases = Getattr(n, "interface:bases")) {
List *keys = Keys(bases);
for (Iterator base = First(keys); base.item; base = Next(base)) {
Node *cls = Getattr(bases, base.item);
if (List *bases = Getattr(n, "interface:bases")) {
for (Iterator base = First(bases); base.item; base = Next(base)) {
Node *cls = base.item;
if (cls == n)
continue;
for (Node *child = firstChild(cls); child; child = nextSibling(child)) {
@ -55,7 +54,6 @@ static List *collect_interface_methods(Node *n) {
}
}
}
Delete(keys);
}
return methods;
}
@ -64,11 +62,11 @@ static List *collect_interface_methods(Node *n) {
* collect_interface_bases
* ----------------------------------------------------------------------------- */
static void collect_interface_bases(Hash *bases, Node *n) {
static void collect_interface_bases(List *bases, Node *n) {
if (GetFlag(n, "feature:interface")) {
String *name = Getattr(n, "interface:name");
if (!Getattr(bases, name))
Setattr(bases, name, n);
Append(bases, n);
}
if (List *baselist = Getattr(n, "bases")) {
@ -106,7 +104,7 @@ static void collect_interface_base_classes(Node *n) {
}
}
Hash *interface_bases = NewHash();
List *interface_bases = NewList();
collect_interface_bases(interface_bases, n);
if (Len(interface_bases) == 0)
Delete(interface_bases);