keyword variable workaround in testcase
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12880 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
4c898b023c
commit
b50e6858ac
2 changed files with 14 additions and 14 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
%module extend_constructor_destructor
|
%module extend_constructor_destructor
|
||||||
|
|
||||||
%inline %{
|
%inline %{
|
||||||
int global = 0;
|
int globalVar = 0;
|
||||||
|
|
||||||
namespace Space {
|
namespace Space {
|
||||||
typedef struct tagAStruct {
|
typedef struct tagAStruct {
|
||||||
|
|
@ -41,11 +41,11 @@ namespace Space {
|
||||||
tagAStruct(int ivar0) {
|
tagAStruct(int ivar0) {
|
||||||
Space::AStruct *s = new Space::AStruct();
|
Space::AStruct *s = new Space::AStruct();
|
||||||
s->ivar = ivar0;
|
s->ivar = ivar0;
|
||||||
global = ivar0;
|
globalVar = ivar0;
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
~tagAStruct() {
|
~tagAStruct() {
|
||||||
global = -$self->ivar;
|
globalVar = -$self->ivar;
|
||||||
delete $self;
|
delete $self;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -54,11 +54,11 @@ namespace Space {
|
||||||
BStruct(int ivar0) {
|
BStruct(int ivar0) {
|
||||||
Space::BStruct *s = new Space::BStruct();
|
Space::BStruct *s = new Space::BStruct();
|
||||||
s->ivar = ivar0;
|
s->ivar = ivar0;
|
||||||
global = ivar0;
|
globalVar = ivar0;
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
~BStruct() {
|
~BStruct() {
|
||||||
global = -$self->ivar;
|
globalVar = -$self->ivar;
|
||||||
delete $self;
|
delete $self;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -67,11 +67,11 @@ namespace Space {
|
||||||
CStruct(int ivar0) {
|
CStruct(int ivar0) {
|
||||||
Space::CStruct *s = new Space::CStruct();
|
Space::CStruct *s = new Space::CStruct();
|
||||||
s->ivar = ivar0;
|
s->ivar = ivar0;
|
||||||
global = ivar0;
|
globalVar = ivar0;
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
~CStruct() {
|
~CStruct() {
|
||||||
global = -$self->ivar;
|
globalVar = -$self->ivar;
|
||||||
delete $self;
|
delete $self;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -80,11 +80,11 @@ namespace Space {
|
||||||
DStruct(int ivar0) {
|
DStruct(int ivar0) {
|
||||||
Space::DStruct *s = new Space::DStruct();
|
Space::DStruct *s = new Space::DStruct();
|
||||||
s->ivar = ivar0;
|
s->ivar = ivar0;
|
||||||
global = ivar0;
|
globalVar = ivar0;
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
~DStruct() {
|
~DStruct() {
|
||||||
global = -$self->ivar;
|
globalVar = -$self->ivar;
|
||||||
delete $self;
|
delete $self;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -95,11 +95,11 @@ namespace Space {
|
||||||
EStruct(int ivar0) {
|
EStruct(int ivar0) {
|
||||||
EStruct *s = new EStruct();
|
EStruct *s = new EStruct();
|
||||||
s->ivar = ivar0;
|
s->ivar = ivar0;
|
||||||
global = ivar0;
|
globalVar = ivar0;
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
~EStruct() {
|
~EStruct() {
|
||||||
global = -$self->ivar;
|
globalVar = -$self->ivar;
|
||||||
delete $self;
|
delete $self;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -109,11 +109,11 @@ namespace Space {
|
||||||
FFStruct(int ivar0) {
|
FFStruct(int ivar0) {
|
||||||
Space::FFStruct<T> *s = new Space::FFStruct<T>();
|
Space::FFStruct<T> *s = new Space::FFStruct<T>();
|
||||||
s->ivar = ivar0;
|
s->ivar = ivar0;
|
||||||
global = ivar0;
|
globalVar = ivar0;
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
~FFStruct() {
|
~FFStruct() {
|
||||||
global = -$self->ivar;
|
globalVar = -$self->ivar;
|
||||||
delete $self;
|
delete $self;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ public class extend_constructor_destructor_runme {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void checkGlobal(int val) {
|
public static void checkGlobal(int val) {
|
||||||
int global = extend_constructor_destructor.getGlobal();
|
int global = extend_constructor_destructor.getGlobalVar();
|
||||||
if (global != val)
|
if (global != val)
|
||||||
throw new RuntimeException("global value incorrect. Expected: " + val + " got: " + global);
|
throw new RuntimeException("global value incorrect. Expected: " + val + " got: " + global);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue