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

Replace scilabArgNumber variable by $input.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12267 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Vincent Couvert 2010-10-14 09:18:23 +00:00
commit 875d4b927f
4 changed files with 102 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/scilab/matrix.i
View file

@ -1,6 +1,6 @@
%typemap(in) (double* matrixAsInput, int rows, int cols) {
int *piAddr = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddr);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddr);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;

166
Lib/scilab/scitypemaps.swg
View file

@ -18,7 +18,7 @@
int iType;
int *piAddrVar;
double *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -46,7 +46,7 @@
int typearg;
char *_pstStrings;
int _piLength;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -86,7 +86,7 @@
int iType;
int *piAddrVar;
void *_piData = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -113,7 +113,7 @@
int *piAddrVar;
char *_pstStrings;
int _piLength;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -147,7 +147,7 @@
int *piAddrVar;
char *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -173,7 +173,7 @@
int *piAddrVar;
unsigned char *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -200,7 +200,7 @@
int *piAddrVar;
short *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -227,7 +227,7 @@
int *piAddrVar;
unsigned short *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -255,7 +255,7 @@
int *piAddrVar;
int *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -283,7 +283,7 @@
int *piAddrVar;
unsigned int *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -312,7 +312,7 @@
int *piAddrVar;
double *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -340,7 +340,7 @@
int *piAddrVar;
long long *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -361,7 +361,7 @@
int *piAddrVar;
unsigned long long *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -382,7 +382,7 @@
int *piAddrVar;
char *_pstStrings;
int _piLength;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -416,7 +416,7 @@
int *piAddrVar;
char *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -444,7 +444,7 @@
int *piAddrVar;
unsigned char *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -472,7 +472,7 @@
int *piAddrVar;
short *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -499,7 +499,7 @@
int *piAddrVar;
unsigned short *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -528,7 +528,7 @@
int *piAddrVar;
int *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -557,7 +557,7 @@
int *piAddrVar;
unsigned int *_piData;
size_t ii = 0;
getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -586,7 +586,7 @@
int *piAddrVar;
double *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -615,7 +615,7 @@
int *piAddrVar;
long long *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -637,7 +637,7 @@
int *piAddrVar;
unsigned long long *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -659,7 +659,7 @@
int iPrec;
int *piAddrVar;
char *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -688,7 +688,7 @@
int iPrec;
int *piAddrVar;
unsigned char *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -717,7 +717,7 @@
int iPrec;
int *piAddrVar;
short *_piData;
getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -746,7 +746,7 @@
int iPrec;
int *piAddrVar;
unsigned short *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -776,7 +776,7 @@
int iPrec;
int *piAddrVar;
int *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -806,7 +806,7 @@
int iPrec;
int *piAddrVar;
unsigned int *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -836,7 +836,7 @@
int iType;
int *piAddrVar;
double *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -866,7 +866,7 @@
int iType;
int *piAddrVar;
long long *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -889,7 +889,7 @@
int iType;
int *piAddrVar;
unsigned long long *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -912,7 +912,7 @@
int iPrec;
int *piAddrVar;
int *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -937,7 +937,7 @@
int iType;
int *piAddrVar;
void *_piData = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -962,7 +962,7 @@
int iType;
int *piAddrVar;
void *_piData = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1237,7 +1237,7 @@
unsigned long long {
int iType;
double *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1263,7 +1263,7 @@
int iType;
char *_pstStrings;
int _piLength;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1290,7 +1290,7 @@
int iType;
char *_pstStrings;
int _piLength;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1323,7 +1323,7 @@
int iType;
char *_pstStrings;
int _piLength;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1357,7 +1357,7 @@
int iPrec;
char *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1383,7 +1383,7 @@
int iPrec;
unsigned char *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1409,7 +1409,7 @@
int iPrec;
short *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1435,7 +1435,7 @@
int iPrec;
unsigned short *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1462,7 +1462,7 @@
int iPrec;
int *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1489,7 +1489,7 @@
int iPrec;
unsigned int *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1516,7 +1516,7 @@
int iType;
double *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1543,7 +1543,7 @@
int iType;
int *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1563,7 +1563,7 @@
int iType;
int *_piData;
size_t ii = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1594,7 +1594,7 @@
unsigned long long * {
int iType;
void *_piData = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1620,7 +1620,7 @@
char **_pstStrings;
int *_piLength;
int i;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1657,7 +1657,7 @@
%typemap(varin,noblock=1) signed char [ANY][ANY] {
int iPrec;
char *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1684,7 +1684,7 @@
%typemap(varin,noblock=1) unsigned char [ANY][ANY] {
int iPrec;
unsigned char *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1712,7 +1712,7 @@
%typemap(varin,noblock=1) short [ANY][ANY] {
int iPrec;
short *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1740,7 +1740,7 @@
%typemap(varin,noblock=1) unsigned short [ANY][ANY] {
int iPrec;
unsigned short *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1769,7 +1769,7 @@
long [ANY][ANY] {
int iPrec;
int *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1798,7 +1798,7 @@
unsigned long [ANY][ANY] {
int iType;
unsigned int *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1827,7 +1827,7 @@
float [ANY][ANY] {
int iType;
double *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1856,7 +1856,7 @@
%typemap(varin,noblock=1) long long [ANY][ANY] {
int iType;
long long *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1878,7 +1878,7 @@
%typemap(varin,noblock=1) unsigned long long [ANY][ANY] {
int iType;
unsigned long long *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1900,7 +1900,7 @@
%typemap(varin,noblock=1) enum SWIGTYPE {
int iPrec;
int *_piData;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1922,7 +1922,7 @@
%typemap(varin,noblock=1) SWIGTYPE * {
int iType;
void *_piData = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1947,7 +1947,7 @@
int iType;
void *_piData = NULL;
size_t ii;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -1973,7 +1973,7 @@
%typemap(varin,noblock=1) SWIGTYPE [ANY][ANY] {
int iType;
void *_piData = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2003,7 +2003,7 @@
%typemap(varin,nobloack=1) SWIGTYPE {
int iType;
void *_piData = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2526,7 +2526,7 @@
%typecheck(SWIG_TYPECHECK_CHAR) char {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2538,7 +2538,7 @@
%typecheck(SWIG_TYPECHECK_INT8) signed char {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2550,7 +2550,7 @@
%typecheck(SWIG_TYPECHECK_UINT8) unsigned char {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2562,7 +2562,7 @@
%typecheck(SWIG_TYPECHECK_INT16) short {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
getVarType(pvApiCtx, piAddrVar, &typearg);
$1 = (typearg == sci_matrix) ? 1 : 0;
}
@ -2570,7 +2570,7 @@
%typecheck(SWIG_TYPECHECK_UINT16) unsigned short {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2583,7 +2583,7 @@
long {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2596,7 +2596,7 @@
unsigned long {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2609,7 +2609,7 @@
%typecheck(SWIG_TYPECHECK_DOUBLE) double {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2621,7 +2621,7 @@
%typecheck(SWIG_TYPECHECK_FLOAT) float {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2633,7 +2633,7 @@
%typecheck(SWIG_TYPECHECK_STRING) char * {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2646,7 +2646,7 @@
%typecheck(SWIG_TYPECHECK_CHAR_ARRAY) char [ANY] {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2658,7 +2658,7 @@
%typecheck(SWIG_TYPECHECK_INT8_ARRAY) signed char [ANY] {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2671,7 +2671,7 @@
short [ANY] {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2685,7 +2685,7 @@
long [ANY] {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2698,7 +2698,7 @@
unsigned long [ANY] {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2710,7 +2710,7 @@
%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY) double [ANY]{
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2722,7 +2722,7 @@
%typecheck(SWIG_TYPECHECK_FLOAT_ARRAY) float [ANY]{
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2734,7 +2734,7 @@
%typecheck(SWIG_TYPECHECK_STRING_ARRAY) char ** {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
@ -2746,7 +2746,7 @@
%typecheck(SWIG_TYPECHECK_POINTER) SWIGTYPE * {
int *piAddrVar;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;

2
Lib/scilab/typemaps.i
View file

@ -63,7 +63,7 @@ or you can use the %apply directive :
int iType;
double *_piData;
int typearg;
sciErr = getVarAddressFromPosition(pvApiCtx, ++scilabArgNumber, &piAddrVar);
sciErr = getVarAddressFromPosition(pvApiCtx, $input, &piAddrVar);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;

21
Source/Modules/scilab.cxx
View file

@ -232,6 +232,12 @@ public:
p = nextSibling(p);
continue;
}
char source[64];
sprintf(source, "%d", j + 1);
Setattr(p, "emit:input", source);
Replaceall(tm, "$input", Getattr(p, "emit:input"));
String *getargs = NewString("");
/* The paremeter is variable */
@ -343,7 +349,7 @@ public:
Printf(f->def, "\nint iOutNum = 1;\nint iVarOut = Rhs + 1;");
/* Insert the argument counter */
Printf(f->def, "\nint scilabArgNumber=0;");
//Printf(f->def, "\nint scilabArgNumber=0;");
/* Finish the the code for the function */
//if (flag)
@ -400,6 +406,11 @@ public:
Wrapper_add_local(f, "sciErr", "SciErr sciErr");
Wrapper_add_local(f, "iOutNum", "int iOutNum = 1");
Wrapper_add_local(f, "iVarOut", "int iVarOut = Rhs + 1");
Printf(tmp, "int argv[%d]={", maxargs);
for (int j = 0; j < maxargs; ++j)
Printf(tmp, "%s%d", j ? "," : " ", j + 1);
Printf(tmp, "}");
Wrapper_add_local(f, "argv", tmp);
/* Dump the dispatch function */
Printv(f->code, dispatch, "\n", NIL);
Printf(f->code, "Scierror(999, _(\"No matching function for overload\"));\n");
@ -464,7 +475,7 @@ public:
/* Add the local variable */
Wrapper_add_local(setf, "piAddrVar", "int *piAddrVar");
/* Insert the argument counter */
Printf(setf->def, "\nint scilabArgNumber=0;");
//Printf(setf->def, "\nint scilabArgNumber=0;");
/* Deal with the set function */
if (is_assignable(n)) {
@ -476,6 +487,7 @@ public:
Replaceall(tm, "iRows", rowname);
Replaceall(tm, "iCols", colname);
Replaceall(tm, "isComplex", iscomplexname);
Replaceall(tm, "$input", "1");
emit_action_code(n, setf->code, tm);
Delete(tm);
} else {
@ -508,7 +520,7 @@ public:
/* Insert the order of output parameters */
Printf(getf->def, "\nint iOutNum=1;\nint iVarOut=Rhs+1;");
/* Insert the argument counter */
Printf(getf->def, "\nint scilabArgNumber=0;");
//Printf(getf->def, "\nint scilabArgNumber=0;");
if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
Replaceall(tm, "$result", name);
@ -581,8 +593,9 @@ public:
Printf(getf->def, "SciErr sciErr;\n");
/* Insert the order of output parameters*/
Printf(getf->def, "\nint iOutNum=1;\nint iVarOut=Rhs+1;");
/* Insert the argument counter */
Printf(getf->def, "\nint scilabArgNumber=0;");
//Printf(getf->def, "\nint scilabArgNumber=0;");
if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
Replaceall(tm, "$result", value);