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

fix handling of function pointers by %constant directive

Browse source
This commit is contained in:
Paweł Tomulik 2016-03-23 15:33:42 +01:00
commit 174523aa80
6 changed files with 69 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Examples/test-suite/constant_directive.i
View file

@ -1,28 +1,41 @@
%module constant_directive
// %constant and struct
%inline %{
struct Type1 {
Type1(int val = 0) : val(val) {}
int val;
};
/* Typedefs for const Type and its pointer */
typedef const Type1 Type1Const;
typedef const Type1* Type1Cptr;
/* Typedefs for function pointers returning Type1 */
typedef Type1 (*Type1Fptr)();
typedef Type1 (* const Type1Cfptr)();
/* Function returning an instance of Type1 */
Type1 getType1Instance() { return Type1(111); }
%}
%{
struct Type1 {
Type1(int val = 0) : val(val) {}
int val;
};
static Type1 TYPE1_CONSTANT1(1);
static Type1 TYPE1_CONST2(2);
static Type1 TYPE1_CONST3(3);
%}
struct Type1 {
Type1(int val = 0) : val(val) {}
int val;
};
%inline %{
Type1 getType1Instance() { return Type1(111); }
%}
%constant Type1 TYPE1_CONSTANT1;
%constant Type1 TYPE1_CONSTANT2 = TYPE1_CONST2;
%constant Type1 *TYPE1_CONSTANT3 = &TYPE1_CONST3;
/* Typedef'ed types */
%constant Type1Const* TYPE1CONST_CONSTANT1 = &TYPE1_CONSTANT1;
%constant Type1Cptr TYPE1CPTR_CONSTANT1 = &TYPE1_CONSTANT1;
/* Function pointers */
%constant Type1 (*TYPE1FPTR1_CONSTANT1)() = getType1Instance;
%constant Type1 (* const TYPE1CFPTR1_CONSTANT1)() = getType1Instance;
/* Typedef'ed function pointers */
%constant Type1Fptr TYPE1FPTR1DEF_CONSTANT1 = getType1Instance;
%constant Type1Cfptr TYPE1CFPTR1DEF_CONSTANT1 = getType1Instance;
/* Regular constant */
%constant int TYPE_INT = 0;

4
Examples/test-suite/java/constant_directive_runme.java
View file

@ -18,5 +18,9 @@ public class constant_directive_runme {
throw new RuntimeException("fail");
if (constant_directive.TYPE1_CONSTANT3.getVal() != 3)
throw new RuntimeException("fail");
if (constant_directive.TYPE1CONST_CONSTANT1.getVal() != 1)
throw new RuntimeException("fail");
if (constant_directive.TYPE1CPTR_CONSTANT1.getVal() != 1)
throw new RuntimeException("fail");
}
}

8
Examples/test-suite/python/constant_directive_runme.py
View file

@ -18,3 +18,11 @@ if constant_directive.TYPE1_CONSTANT2.val != 2:
if constant_directive.TYPE1_CONSTANT3.val != 3:
raise RuntimeError("constant_directive.TYPE1_CONSTANT3.val is %r (should be 3)" %
constant_directive.TYPE1_CONSTANT3.val)
if constant_directive.TYPE1CONST_CONSTANT1.val != 1:
raise RuntimeError("constant_directive.TYPE1CONST_CONSTANT1.val is %r (should be 1)" %
constant_directive.TYPE1CONST_CONSTANT1.val)
if constant_directive.TYPE1CPTR_CONSTANT1.val != 1:
raise RuntimeError("constant_directive.TYPE1CPTR_CONSTANT1.val is %r (should be 1)" %
constant_directive.TYPE1CPTR_CONSTANT1.val)