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

fix for nested ignored types

Browse source
This commit is contained in:
Vladimir Kalinin 2016-05-18 18:07:04 +03:00
commit 0145a07cc3
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/Modules/csharp.cxx
View file

@ -188,8 +188,12 @@ public:
String *symname = Copy(Getattr(n, "sym:name")); String *symname = Copy(Getattr(n, "sym:name"));
if (symname && !GetFlag(n, "feature:flatnested")) { if (symname && !GetFlag(n, "feature:flatnested")) {
for (Node *outer_class = Getattr(n, "nested:outer"); outer_class; outer_class = Getattr(outer_class, "nested:outer")) { for (Node *outer_class = Getattr(n, "nested:outer"); outer_class; outer_class = Getattr(outer_class, "nested:outer")) {
if (String* name = Getattr(outer_class, "sym:name")) {
Push(symname, "."); Push(symname, ".");
Push(symname, Getattr(outer_class, "sym:name")); Push(symname, name);
}
else
return NULL;
} }
} }
if (nspace) { if (nspace) {

6
Source/Modules/java.cxx
View file

@ -211,8 +211,12 @@ public:
String *symname = Copy(Getattr(n, "sym:name")); String *symname = Copy(Getattr(n, "sym:name"));
if (symname && !GetFlag(n, "feature:flatnested")) { if (symname && !GetFlag(n, "feature:flatnested")) {
for (Node *outer_class = Getattr(n, "nested:outer"); outer_class; outer_class = Getattr(outer_class, "nested:outer")) { for (Node *outer_class = Getattr(n, "nested:outer"); outer_class; outer_class = Getattr(outer_class, "nested:outer")) {
if (String* name = Getattr(outer_class, "sym:name")) {
Push(symname, jnidescriptor ? "$" : "."); Push(symname, jnidescriptor ? "$" : ".");
Push(symname, Getattr(outer_class, "sym:name")); Push(symname, name);
}
else
return NULL;
} }
} }
if (nspace) { if (nspace) {