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

more test cases, less cast operations

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8266 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-07 00:57:44 +00:00
commit a29cb3bb02
3 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/test-suite/array_member.i
View file

@ -40,6 +40,10 @@ int get_value(int *x, int i) {
const Material * chitMat[Size]; const Material * chitMat[Size];
Material hitMat_val[Size]; Material hitMat_val[Size];
Material *hitMat[Size]; Material *hitMat[Size];
const Material * chitMat2[Size][Size];
Material hitMat_val2[Size][Size];
Material *hitMat2[Size][Size];
}; };
} }

19
Examples/test-suite/arrays_global_twodim.i
View file

@ -40,3 +40,22 @@ int get_2d_array(int (*array)[ARRAY_LEN_Y], int x, int y){
} }
%} %}
#ifdef __cplusplus
%inline
{
struct Material
{
};
enum {
Size = 32
};
const Material * chitMat[Size][Size];
Material hitMat_val[Size][Size];
Material *hitMat[Size][Size];
}
#endif

27
Lib/typemaps/swigtype.swg
View file

@ -154,16 +154,12 @@
/* memberin/globalin/varin, for fix double arrays. */ /* memberin/globalin/varin, for fix double arrays. */
%typemap(memberin) SWIGTYPE [ANY][ANY] { %typemap(memberin) SWIGTYPE [ANY][ANY] {
$basetype (*inp)[$dim1] = %static_cast($input, $basetype (*)[$dim1]); if ($input) {
if (inp) {
$basetype (*dest)[$dim1] = %static_cast($1, $basetype (*)[$dim1]);
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)$dim0; ++ii) { for (; ii < (size_t)$dim0; ++ii) {
$basetype *ip = inp[ii]; if ($input[ii]) {
if (ip) {
$basetype *dp = dest[ii];
size_t jj = 0; size_t jj = 0;
for (; jj < (size_t)$dim1; ++jj) dp[jj] = ip[jj]; for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = $input[ii][jj];
} else { } else {
%variable_nullref("$type","$name"); %variable_nullref("$type","$name");
} }
@ -174,16 +170,12 @@
} }
%typemap(globalin) SWIGTYPE [ANY][ANY] { %typemap(globalin) SWIGTYPE [ANY][ANY] {
$basetype (*inp)[$dim1] = %static_cast($input, $basetype (*)[$dim1]); if ($input) {
if (inp) {
$basetype (*dest)[$dim1] = %static_cast($1, $basetype (*)[$dim1]);
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)$dim0; ++ii) { for (; ii < (size_t)$dim0; ++ii) {
$basetype *ip = inp[ii]; if ($input[ii]) {
if (ip) {
$basetype *dp = dest[ii];
size_t jj = 0; size_t jj = 0;
for (; jj < (size_t)$dim1; ++jj) dp[jj] = ip[jj]; for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = $input[ii][jj];
} else { } else {
%variable_nullref("$type","$name"); %variable_nullref("$type","$name");
} }
@ -199,14 +191,11 @@
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%variable_fail(SWIG_TypeError, "$type", "$name"); %variable_fail(SWIG_TypeError, "$type", "$name");
} else if (inp) { } else if (inp) {
$basetype (*dest)[$dim1] = %static_cast($1, $basetype (*)[$dim1]);
size_t ii = 0; size_t ii = 0;
for (; ii < $dim0; ++ii) { for (; ii < $dim0; ++ii) {
$basetype *ip = inp[ii]; if (inp[ii]) {
if (ip) {
$basetype *dp = dest[ii];
size_t jj = 0; size_t jj = 0;
for (; jj < $dim1; ++jj) dp[jj] = ip[jj]; for (; jj < $dim1; ++jj) $1[ii][jj] = inp[ii][jj];
} else { } else {
%variable_nullref("$type", "$name"); %variable_nullref("$type", "$name");
} }