add in global array variable
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9668 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
1f76e733a9
commit
6efec03cda
2 changed files with 39 additions and 2 deletions
|
|
@ -13,10 +13,9 @@ public class li_carrays_runme {
|
|||
|
||||
public static void main(String argv[]) throws Throwable
|
||||
{
|
||||
int length = 5;
|
||||
|
||||
// array_class
|
||||
{
|
||||
int length = 5;
|
||||
XYArray xyArray = new XYArray(length);
|
||||
for (int i=0; i<length; i++) {
|
||||
XY xy = xyArray.getitem(i);
|
||||
|
|
@ -30,8 +29,26 @@ public class li_carrays_runme {
|
|||
}
|
||||
}
|
||||
|
||||
{
|
||||
// global array variable
|
||||
int length = 5;
|
||||
XY xyArrayPointer = li_carrays.getGlobalXYArray();
|
||||
XYArray xyArray = XYArray.frompointer(xyArrayPointer);
|
||||
for (int i=0; i<length; i++) {
|
||||
XY xy = xyArray.getitem(i);
|
||||
xy.setX(i*10);
|
||||
xy.setY(i*100);
|
||||
xyArray.setitem(i, xy);
|
||||
}
|
||||
for (int i=0; i<length; i++) {
|
||||
Assert(xyArray.getitem(i).getX(), i*10);
|
||||
Assert(xyArray.getitem(i).getY(), i*100);
|
||||
}
|
||||
}
|
||||
|
||||
// array_functions
|
||||
{
|
||||
int length = 5;
|
||||
AB abArray = li_carrays.new_ABArray(length);
|
||||
for (int i=0; i<length; i++) {
|
||||
AB ab = li_carrays.ABArray_getitem(abArray, i);
|
||||
|
|
@ -45,6 +62,22 @@ public class li_carrays_runme {
|
|||
}
|
||||
li_carrays.delete_ABArray(abArray);
|
||||
}
|
||||
|
||||
{
|
||||
// global array variable
|
||||
int length = 3;
|
||||
AB abArray = li_carrays.getGlobalABArray();
|
||||
for (int i=0; i<length; i++) {
|
||||
AB ab = li_carrays.ABArray_getitem(abArray, i);
|
||||
ab.setA(i*10);
|
||||
ab.setB(i*100);
|
||||
li_carrays.ABArray_setitem(abArray, i, ab);
|
||||
}
|
||||
for (int i=0; i<length; i++) {
|
||||
Assert(li_carrays.ABArray_getitem(abArray, i).getA(), i*10);
|
||||
Assert(li_carrays.ABArray_getitem(abArray, i).getB(), i*100);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static void Assert(int val1, int val2) {
|
||||
|
|
|
|||
|
|
@ -12,10 +12,14 @@ typedef struct {
|
|||
int x;
|
||||
int y;
|
||||
} XY;
|
||||
XY globalXYArray[3];
|
||||
|
||||
typedef struct {
|
||||
int a;
|
||||
int b;
|
||||
} AB;
|
||||
|
||||
AB globalABArray[3];
|
||||
%}
|
||||
|
||||
// Note that struct XY { ... }; gives compiler error for C when using %array_class or %array_functions, but is okay in C++
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue