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

fixed out-of-scope nested class definitions, added a test

Browse source 
enabled nested C structs assignment (still disabled for Octave), added Java runtime test
fixed nested_private test case for Java & C#
This commit is contained in:
Vladimir Kalinin 2013-12-04 01:53:42 +04:00
commit e1a4e11bea
6 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/CParse/parser.y
View file

@ -3387,6 +3387,8 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE {
/* If the class name is qualified. We need to create or lookup namespace/scope entries */
scope = resolve_create_node_scope($3);
/* save nscope_inner to the class - it may be overwritten in nested classes*/
Setattr($<node>$, "nested:innerscope", nscope_inner);
Setfile(scope,cparse_file);
Setline(scope,cparse_line);
$3 = scope;
@ -3462,6 +3464,10 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE {
(void) $<node>6;
$$ = currentOuterClass;
currentOuterClass = Getattr($$, "nested:outer");
nscope_inner = Getattr($<node>$, "nested:innerscope");
Delattr($<node>$, "nested:innerscope");
if (nscope_inner) /*actual parent class for this class*/
Setattr($$, "nested:outer", nscope_inner);
if (!currentOuterClass)
inclass = 0;
cscope = Getattr($$, "prev_symtab");
@ -3490,14 +3496,16 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE {
if (am) append_previous_extension($$,am);
p = $9;
if (p) {
if (p && !nscope_inner) {
if (!cparse_cplusplus && currentOuterClass)
appendChild(currentOuterClass, p);
else
appendSibling($$, p);
}
if (cparse_cplusplus && !cparse_externc) {
if (nscope_inner) {
ty = NewString(scpname); /* if the class is declared out of scope, let the declarator use fully qualified type*/
} else if (cparse_cplusplus && !cparse_externc) {
ty = NewString($3);
} else {
ty = NewStringf("%s %s", $2,$3);
@ -3505,7 +3513,7 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE {
while (p) {
Setattr(p,"storage",$1);
Setattr(p,"type",ty);
if (!cparse_cplusplus) {
if (!cparse_cplusplus && currentOuterClass && (!Getattr(currentOuterClass, "name") || CPlusPlusOut)) {
SetFlag(p,"hasconsttype");
SetFlag(p,"feature:immutable");
}
@ -3539,12 +3547,13 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE {
Delete(Namespaceprefix);
Namespaceprefix = Swig_symbol_qualifiedscopename(0);
add_symbols($$);
if (nscope) $$ = nscope;
/* but the variable definition in the current scope */
Swig_symbol_setscope(cscope);
Delete(Namespaceprefix);
Namespaceprefix = Swig_symbol_qualifiedscopename(0);
add_symbols($9);
nscope_inner = 0;
$$ = $9;
} else {
Delete(yyrename);
yyrename = 0;
@ -3657,7 +3666,7 @@ cpp_class_decl : storage_class cpptype idcolon inherit LBRACE {
while (n) {
Setattr(n,"storage",$1);
Setattr(n, "type", ty);
if (!cparse_cplusplus) {
if (!cparse_cplusplus && currentOuterClass && (!Getattr(currentOuterClass, "name") || CPlusPlusOut)) {
SetFlag(n,"hasconsttype");
SetFlag(n,"feature:immutable");
}

2
Source/Modules/csharp.cxx
View file

@ -182,7 +182,7 @@ public:
if (!proxyname) {
String *nspace = Getattr(n, "sym:nspace");
String *symname = Copy(Getattr(n, "sym:name"));
if (!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")) {
Push(symname, ".");
Push(symname, Getattr(outer_class, "sym:name"));

2
Source/Modules/java.cxx
View file

@ -209,7 +209,7 @@ public:
if (!proxyname || jnidescriptor) {
String *nspace = Getattr(n, "sym:nspace");
String *symname = Copy(Getattr(n, "sym:name"));
if (!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")) {
Push(symname, ".");
Push(symname, Getattr(outer_class, "sym:name"));