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

update old syntax to new _dim0

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11124 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2009-02-08 22:54:58 +00:00
commit 6d03b7ce6a
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/swig.swg
View file

@ -467,26 +467,26 @@ namespace std {
/* memberin/globalin typemap for double arrays. */ /* memberin/globalin typemap for double arrays. */
%typemap(memberin) SWIGTYPE [ANY][ANY] { %typemap(memberin) SWIGTYPE [ANY][ANY] {
$basetype (*inp)[$dim1] = ($basetype (*)[$dim1])($input); $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);
$basetype (*dest)[$dim1] = ($basetype (*)[$dim1])($1); $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);
size_t ii = 0; size_t ii = 0;
for (; ii < $dim0; ++ii) { for (; ii < $1_dim0; ++ii) {
$basetype *ip = inp[ii]; $basetype *ip = inp[ii];
$basetype *dp = dest[ii]; $basetype *dp = dest[ii];
size_t jj = 0; size_t jj = 0;
for (; jj < $dim1; ++jj) dp[jj] = ip[jj]; for (; jj < $1_dim1; ++jj) dp[jj] = ip[jj];
} }
} }
%typemap(globalin) SWIGTYPE [ANY][ANY] { %typemap(globalin) SWIGTYPE [ANY][ANY] {
$basetype (*inp)[$dim1] = ($basetype (*)[$dim1])($input); $basetype (*inp)[$1_dim1] = ($basetype (*)[$1_dim1])($input);
$basetype (*dest)[$dim1] = ($basetype (*)[$dim1])($1); $basetype (*dest)[$1_dim1] = ($basetype (*)[$1_dim1])($1);
size_t ii = 0; size_t ii = 0;
for (; ii < $dim0; ++ii) { for (; ii < $1_dim0; ++ii) {
$basetype *ip = inp[ii]; $basetype *ip = inp[ii];
$basetype *dp = dest[ii]; $basetype *dp = dest[ii];
size_t jj = 0; size_t jj = 0;
for (; jj < $dim1; ++jj) dp[jj] = ip[jj]; for (; jj < $1_dim1; ++jj) dp[jj] = ip[jj];
} }
} }

20
Lib/typemaps/swigtype.swg
View file

@ -124,7 +124,7 @@
%typemap(memberin) SWIGTYPE [ANY] { %typemap(memberin) SWIGTYPE [ANY] {
if ($input) { if ($input) {
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)$dim0; ++ii) $1[ii] = $input[ii]; for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = $input[ii];
} else { } else {
%variable_nullref("$type","$name"); %variable_nullref("$type","$name");
} }
@ -133,7 +133,7 @@
%typemap(globalin) SWIGTYPE [ANY] { %typemap(globalin) SWIGTYPE [ANY] {
if ($input) { if ($input) {
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)$dim0; ++ii) $1[ii] = $input[ii]; for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = $input[ii];
} else { } else {
%variable_nullref("$type","$name"); %variable_nullref("$type","$name");
} }
@ -146,7 +146,7 @@
%variable_fail(res, "$type", "$name"); %variable_fail(res, "$type", "$name");
} else if (inp) { } else if (inp) {
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)$dim0; ++ii) $1[ii] = inp[ii]; for (; ii < (size_t)$1_dim0; ++ii) $1[ii] = inp[ii];
} else { } else {
%variable_nullref("$type", "$name"); %variable_nullref("$type", "$name");
} }
@ -158,10 +158,10 @@
%typemap(memberin) SWIGTYPE [ANY][ANY] { %typemap(memberin) SWIGTYPE [ANY][ANY] {
if ($input) { if ($input) {
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)$dim0; ++ii) { for (; ii < (size_t)$1_dim0; ++ii) {
if ($input[ii]) { if ($input[ii]) {
size_t jj = 0; size_t jj = 0;
for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = $input[ii][jj]; for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = $input[ii][jj];
} else { } else {
%variable_nullref("$type","$name"); %variable_nullref("$type","$name");
} }
@ -174,10 +174,10 @@
%typemap(globalin) SWIGTYPE [ANY][ANY] { %typemap(globalin) SWIGTYPE [ANY][ANY] {
if ($input) { if ($input) {
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)$dim0; ++ii) { for (; ii < (size_t)$1_dim0; ++ii) {
if ($input[ii]) { if ($input[ii]) {
size_t jj = 0; size_t jj = 0;
for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = $input[ii][jj]; for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = $input[ii][jj];
} else { } else {
%variable_nullref("$type","$name"); %variable_nullref("$type","$name");
} }
@ -188,16 +188,16 @@
} }
%typemap(varin) SWIGTYPE [ANY][ANY] { %typemap(varin) SWIGTYPE [ANY][ANY] {
$basetype (*inp)[$dim1] = 0; $basetype (*inp)[$1_dim1] = 0;
int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags); int res = SWIG_ConvertPtr($input, %as_voidptrptr(&inp), $descriptor, %convertptr_flags);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%variable_fail(res, "$type", "$name"); %variable_fail(res, "$type", "$name");
} else if (inp) { } else if (inp) {
size_t ii = 0; size_t ii = 0;
for (; ii < (size_t)$dim0; ++ii) { for (; ii < (size_t)$1_dim0; ++ii) {
if (inp[ii]) { if (inp[ii]) {
size_t jj = 0; size_t jj = 0;
for (; jj < (size_t)$dim1; ++jj) $1[ii][jj] = inp[ii][jj]; for (; jj < (size_t)$1_dim1; ++jj) $1[ii][jj] = inp[ii][jj];
} else { } else {
%variable_nullref("$type", "$name"); %variable_nullref("$type", "$name");
} }