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

Correctly skip ignored base classes in C++ wrappers

Browse source 
Don't refuse to generate C++ wrapper class if there is just one real
base class and the other one(s) are ignored.
This commit is contained in:
Vadim Zeitlin 2021-11-21 01:44:33 +01:00
commit 036e3eb08c
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Modules/c.cxx
View file

@ -189,12 +189,11 @@ public:
scoped_dohptr base_classes(NewStringEmpty()); scoped_dohptr base_classes(NewStringEmpty());
if (List *baselist = Getattr(n, "bases")) { if (List *baselist = Getattr(n, "bases")) {
Iterator i = First(baselist); for (Iterator i = First(baselist); i.item; i = Next(i)) {
if (i.item) { if (Checkattr(i.item, "feature:ignore", "1"))
first_base_ = Copy(i.item); continue;
i = Next(i); if (first_base_) {
if (i.item) {
Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n), Swig_warning(WARN_C_UNSUPPORTTED, Getfile(n), Getline(n),
"Multiple inheritance not supported yet, skipping C++ wrapper generation for %s\n", "Multiple inheritance not supported yet, skipping C++ wrapper generation for %s\n",
Getattr(n, "sym:name") Getattr(n, "sym:name")
@ -203,6 +202,8 @@ public:
// Return before initializing class_node_, so that the dtor won't output anything neither. // Return before initializing class_node_, so that the dtor won't output anything neither.
return; return;
} }
first_base_ = Copy(i.item);
} }
Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL); Printv(base_classes, " : public ", Getattr(first_base_, "sym:name"), NIL);