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

Fix handling of typedef'd function pointers for Go

Browse source 
Add equivalent runtime tests for Python and Java
This commit is contained in:
William S Fulton 2017-03-17 07:49:21 +00:00
commit dcc5911839
6 changed files with 101 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Examples/test-suite/go/typedef_funcptr_runme.go Normal file
View file

@ -0,0 +1,29 @@
package main
import . "./typedef_funcptr"
func main() {
a := 100
b := 10
if Do_op(a,b,Addf) != 110 {
panic(0)
}
if Do_op(a,b,Subf) != 90 {
panic(0)
}
if Do_op_typedef_int(a,b,Addf) != 110 {
panic(0)
}
if Do_op_typedef_int(a,b,Subf) != 90 {
panic(0)
}
if Do_op_typedef_Integer(a,b,Addf) != 110 {
panic(0)
}
if Do_op_typedef_Integer(a,b,Subf) != 90 {
panic(0)
}
}

34
Examples/test-suite/java/typedef_funcptr_runme.java Normal file
View file

@ -0,0 +1,34 @@
import typedef_funcptr.*;
public class typedef_funcptr_runme {
static {
try {
System.loadLibrary("typedef_funcptr");
} catch (UnsatisfiedLinkError e) {
System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
System.exit(1);
}
}
public static void main(String argv[]) {
int a = 100;
int b = 10;
if (typedef_funcptr.do_op(a,b,typedef_funcptr.addf) != 110)
throw new RuntimeException("addf failed");
if (typedef_funcptr.do_op(a,b,typedef_funcptr.subf) != 90)
throw new RuntimeException("subf failed");
if (typedef_funcptr.do_op_typedef_int(a,b,typedef_funcptr.addf) != 110)
throw new RuntimeException("addf failed");
if (typedef_funcptr.do_op_typedef_int(a,b,typedef_funcptr.subf) != 90)
throw new RuntimeException("subf failed");
if (typedef_funcptr.do_op_typedef_Integer(a,b,typedef_funcptr.addf) != 110)
throw new RuntimeException("addf failed");
if (typedef_funcptr.do_op_typedef_Integer(a,b,typedef_funcptr.subf) != 90)
throw new RuntimeException("subf failed");
}
}

20
Examples/test-suite/python/typedef_funcptr_runme.py Normal file
View file

@ -0,0 +1,20 @@
import typedef_funcptr
a = 100
b = 10
if typedef_funcptr.do_op(a,b,typedef_funcptr.addf) != 110:
raise RuntimeError("addf failed")
if typedef_funcptr.do_op(a,b,typedef_funcptr.subf) != 90:
raise RuntimeError("subf failed")
if typedef_funcptr.do_op_typedef_int(a,b,typedef_funcptr.addf) != 110:
raise RuntimeError("addf failed")
if typedef_funcptr.do_op_typedef_int(a,b,typedef_funcptr.subf) != 90:
raise RuntimeError("subf failed")
if typedef_funcptr.do_op_typedef_Integer(a,b,typedef_funcptr.addf) != 110:
raise RuntimeError("addf failed")
if typedef_funcptr.do_op_typedef_Integer(a,b,typedef_funcptr.subf) != 90:
raise RuntimeError("subf failed")

10
Examples/test-suite/typedef_funcptr.i
View file

@ -21,6 +21,16 @@ extern "C"
Integer do_op(Integer x, Integer y, Integer (*op)(Integer, Integer)) {
return (*op)(x,y);
}
typedef int (*FnPtr_int_td)(int, int);
int do_op_typedef_int(int x, int y, FnPtr_int_td op) {
return (*op)(x,y);
}
typedef Integer (*FnPtr_Integer_td)(Integer, Integer);
Integer do_op_typedef_Integer(Integer x, Integer y, FnPtr_Integer_td op) {
return (*op)(x,y);
}
%}
%constant int addf(int x, int y);