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

Merge branch 'wkalinin-csymbols-2' - %extend and nested structs

Browse source 
* wkalinin-csymbols-2:
  Add runtime test for %extend and nested union
  test fixed
  %extend symbols for nested structs get into a wrong C symbol table
This commit is contained in:
William S Fulton 2014-06-02 07:11:22 +01:00
commit 81d023ac05
3 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Examples/test-suite/java/nested_extend_c_runme.java
View file

@ -34,5 +34,12 @@ public class nested_extend_c_runme {
if (low.low_extend() != 99)
throw new RuntimeException("test failed");
}
{
FOO_bar foobar = new FOO_bar();
foobar.setD(1234);
if (foobar.getD() != 1234)
throw new RuntimeException("test failed");
foobar.bar_extend();
}
}
}

7
Examples/test-suite/nested_extend_c.i
View file

@ -10,6 +10,7 @@
char hi_extend() {
return $self->c;
}
static const long swig_size = sizeof(union hiA);
}
%extend lowA {
lowA() {
@ -21,6 +22,7 @@
int low_extend() {
return $self->num;
}
static const long swig_size = sizeof(struct lowA);
}
%extend hiB {
@ -32,6 +34,7 @@
char hi_extend() {
return $self->c;
}
static const long swig_size = sizeof(union hiB);
}
%extend lowB {
lowB() {
@ -43,6 +46,7 @@
int low_extend() {
return $self->num;
}
static const long swig_size = sizeof(struct lowB);
}
%extend FOO_bar {
@ -50,6 +54,9 @@
$self->d = 1;
}
};
%extend NestedA {
static const long swig_size = sizeof(struct NestedA);
}
#endif

14
Source/Modules/nested.cxx
View file

@ -362,7 +362,15 @@ void Swig_nested_name_unnamed_c_structs(Node *n) {
Delete(bases);
}
Setattr(classhash, name, c);
// Merge the extension into the symbol table
if (Node *am = Getattr(Swig_extend_hash(), name)) {
Swig_extend_merge(c, am);
Swig_extend_append_previous(c, am);
Delattr(Swig_extend_hash(), name);
}
Swig_symbol_popscope();
// process declarations following this type (assign correct new type)
SwigType *ty = Copy(name);
Node *decl = nextSibling(c);
@ -376,12 +384,6 @@ void Swig_nested_name_unnamed_c_structs(Node *n) {
decl = nextSibling(decl);
}
Delete(ty);
if (Node *am = Getattr(Swig_extend_hash(), name)) {
// Merge the extension into the symbol table
Swig_extend_merge(c, am);
Swig_extend_append_previous(c, am);
Delattr(Swig_extend_hash(), name);
}
Swig_symbol_setscope(Swig_symbol_global_scope());
add_symbols_c(c);