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

OUTPUT typemaps on methods that don't return void

Browse source 
SWIGJSC_ValueIsArray could be implemented by JSValueIsArray in later
versions of Javascript webkit, similar fix to previous commits for v8.

Enhance testing of OUTPUT typemaps to test more than one output.
This commit is contained in:
William S Fulton 2021-03-01 14:20:18 +00:00
commit 4b64becbbb
5 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/test-suite/javascript/li_typemaps_runme.js
View file

@ -10,7 +10,7 @@ function check_array(a, b) {
if (a.length != b.length)
throw new Error("Array length mismatch " + a.length + " " + b.length)
if (!a.every(function(element, index) { return element === b[index]; }))
throw new Error("Arrays don't match a: " + a + " b:" + b)
throw new Error("Arrays don't match a:" + a + " b:" + b)
}
// Check double INPUT typemaps
@ -47,3 +47,4 @@ check_array(li_typemaps.inoutr_int2(1,2), [1, 2])
fi = li_typemaps.out_foo(10)
check(fi[0].a, 10)
check(fi[1], 20)
check(fi[2], 30)

6
Examples/test-suite/li_typemaps.i
View file

@ -2,6 +2,7 @@
%include "typemaps.i"
%apply int *OUTPUT { int *OUTPUT2 };
%apply int &INOUT { int &INOUT2 };
%newobject out_foo;
%inline %{
@ -51,10 +52,13 @@ void out_longlong(long long x, long long *OUTPUT) { *OUTPUT = x; }
void out_ulonglong(unsigned long long x, unsigned long long *OUTPUT) { *OUTPUT = x; }
/* Tests a returning a wrapped pointer and an output argument */
struct Foo *out_foo(int a, int *OUTPUT) {
struct Foo *out_foo(int a, int *OUTPUT, int *OUTPUT2) {
struct Foo *f = new struct Foo();
f->a = a;
*OUTPUT = a * 2;
struct Foo *f2 = new struct Foo();
f2->a = a;
*OUTPUT2 = a * 3;
return f;
}

4
Examples/test-suite/lua/li_typemaps_runme.lua
View file

@ -38,5 +38,5 @@ assert(li_typemaps.inoutr_bool(false)==false)
a,b=li_typemaps.inoutr_int2(1,2)
assert(a==1 and b==2)
f,i=li_typemaps.out_foo(10)
assert(f.a==10 and i==20)
f,i,i2=li_typemaps.out_foo(10)
assert(f.a==10 and i==20 and i2==30)

5
Examples/test-suite/perl5/li_typemaps_runme.pl
View file

@ -1,7 +1,7 @@
#!/usr/bin/perl
use strict;
use warnings;
use Test::More tests => 415;
use Test::More tests => 416;
BEGIN { use_ok('li_typemaps') }
require_ok('li_typemaps');
@ -75,10 +75,11 @@ SKIP: {
batch('ulonglong', $c);
}
my($foo, $int) = li_typemaps::out_foo(10);
my($foo, $int, $int2) = li_typemaps::out_foo(10);
isa_ok($foo, 'li_typemaps::Foo');
is($foo->{a}, 10);
is($int, 20);
is($int2, 30);
my($a, $b) = li_typemaps::inoutr_int2(13, 31);
is($a, 13);