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

fix varin typemap

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6896 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-12-19 04:34:43 +00:00
commit e7b400bc7d
3 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SWIG/Examples/test-suite/common.mk
View file

@ -140,6 +140,7 @@ CPP_TEST_CASES += \
features \ features \
friends \ friends \
global_ns_arg \ global_ns_arg \
global_vars \
grouping \ grouping \
ignore_parameter \ ignore_parameter \
import_nomodule \ import_nomodule \

22
SWIG/Examples/test-suite/global_vars.i Normal file
View file

@ -0,0 +1,22 @@
%module global_vars
%inline %{
struct A
{
int x;
};
A a;
A *ap;
const A *cap;
A &ar = a;
int x;
int *xp;
void *vp;
%}

14
SWIG/Lib/perl5/perl5.swg
View file

@ -245,7 +245,7 @@
%typemap(varin) SWIGTYPE * { %typemap(varin) SWIGTYPE * {
void *temp; void *temp;
if (SWIG_ConvertPtr($input, (void **) &$1, $1_descriptor,0) < 0) { if (SWIG_ConvertPtr($input, &temp, $1_descriptor,0) < 0) {
croak("Type error in argument $argnum of $symname. Expected $1_mangle"); croak("Type error in argument $argnum of $symname. Expected $1_mangle");
} }
$1 = ($1_ltype) temp; $1 = ($1_ltype) temp;
@ -268,25 +268,27 @@
%typemap(varin) SWIGTYPE & { %typemap(varin) SWIGTYPE & {
void *temp; void *temp;
if (SWIG_ConvertPtr($input, (void **) &temp, $1_descriptor,0) < 0) { if (SWIG_ConvertPtr($input, &temp, $1_descriptor,0) < 0) {
croak("Type error in argument $argnum of $symname. Expected $1_mangle"); croak("Type error in argument $argnum of $symname. Expected $1_mangle");
} }
$1 = *($1_ltype) temp; $1 = *($1_ltype) temp;
} }
%typemap(varin) void * { %typemap(varin) void * {
if (SWIG_ConvertPtr($input, (void **) &$1, 0,0) < 0) { void *temp;
if (SWIG_ConvertPtr($input, &temp, 0,0) < 0) {
croak("Type error in argument $argnum of $symname. Expected $1_mangle"); croak("Type error in argument $argnum of $symname. Expected $1_mangle");
} }
$1 = temp;
} }
/* Object passed by value. Convert to a pointer */ /* Object passed by value. Convert to a pointer */
%typemap(varin) SWIGTYPE { %typemap(varin) SWIGTYPE {
$&1_ltype argp; $&1_ltype temp;
if (SWIG_ConvertPtr($input,(void **) &argp, $&1_descriptor,0) < 0) { if (SWIG_ConvertPtr($input,(void **) &temp, $&1_descriptor,0) < 0) {
croak("Type error in argument $argnum of $symname. Expected $&1_mangle"); croak("Type error in argument $argnum of $symname. Expected $&1_mangle");
} }
$1 = *argp; $1 = *temp;
} }
/* Member pointer */ /* Member pointer */