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

Represent scoped enums as scoped enums in C++ wrappers

Browse source 
This is better than turning them into unscoped enums with a prefix for
the elements.
This commit is contained in:
Vadim Zeitlin 2021-11-29 14:54:39 +01:00
commit e4bb84f3bd
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Source/Modules/c.cxx
View file

@ -2573,9 +2573,17 @@ public:
enumname = Copy(name);
}
// C++ enum name shouldn't include the prefix, so make a copy before enumname is modified below.
if (cxx_enum_decl)
cxx_enumname = Copy(enumname);
const bool scoped_enum = Checkattr(n, "scopedenum", "1");
if (cxx_enum_decl) {
// In C++ we can use actual scoped enums instead of emulating them with element prefixes.
if (scoped_enum)
Printv(cxx_enum_decl, " class", NIL);
// And enum name itself shouldn't include the prefix neither, as this enum is either inside a namespace or inside a class, so use enumname before it
// gets updated below.
Printv(cxx_enum_decl, " ", enumname.get(), NIL);
}
if (enum_prefix) {
enumname = NewStringf("%s_%s", enum_prefix, enumname.get());
@ -2586,7 +2594,7 @@ public:
Printv(cxx_enum_decl, " ", cxx_enumname.get(), NIL);
// For scoped enums, their name should be prefixed to their elements in addition to any other prefix we use.
if (Getattr(n, "scopedenum")) {
if (scoped_enum) {
enum_prefix = enumname.get();
cxx_enum_prefix = cxx_enumname.get();
}