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

scilab: rename matrix typemaps named parameters

Browse source
This commit is contained in:
Simon Marchetto 2014-06-13 16:21:21 +02:00
commit 3ac0dc2be5
7 changed files with 134 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Doc/Manual/Scilab.html
View file

@ -1549,19 +1549,19 @@ Several typemaps are available for the common Scilab matrix types:
<p> <p>
For example: for a matrix of <tt>int</tt>, we have the typemaps, for input: For example: for a matrix of <tt>int</tt>, we have the typemaps, for input:
<ul> <ul>
<li><tt>(int *matrixIn, int matrixInRowCount, int matrixInColCount)</tt></li> <li><tt>(int *IN, int IN_ROWCOUNT, int IN_COLCOUNT)</tt></li>
<li><tt>(int matrixInRowCount, int matrixInColCount, int *matrixIn)</tt></li> <li><tt>(int IN_ROWCOUNT, int IN_COLCOUNT, int *IN)</tt></li>
<li><tt>(int *matrixIn, int matrixInSize)</tt></li> <li><tt>(int *IN, int IN_SIZE)</tt></li>
<li><tt>(int matrixInSize, int *matrixIn)</tt></li> <li><tt>(int IN_SIZE, int *IN)</tt></li>
</ul> </ul>
</p> </p>
<p> <p>
and output: and output:
<ul> <ul>
<li><tt>(int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount)</tt></li> <li><tt>(int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)</tt></li>
<li><tt>(int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut)</tt></li> <li><tt>(int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)</tt></li>
<li><tt>(int **matrixOut, int *matrixOutSize)</tt></li> <li><tt>(int **OUT, int *OUT_SIZE)</tt></li>
<li><tt>(int *matrixOutSize, int **matrixOut)</tt></li> <li><tt>(int *OUT_SIZE, int **OUT)</tt></li>
</ul> </ul>
</p> </p>
@ -1575,8 +1575,8 @@ The following is an example using the typemaps in this library:
%include &lt;matrix.i&gt; %include &lt;matrix.i&gt;
%apply (int *matrixIn, int matrixInRowCount, int matrixInColCount) { (int *matrix, int matrixNbRow, int matrixNbCol) }; %apply (int *IN, int IN_ROWCOUNT, int IN_COLCOUNT) { (int *matrix, int matrixNbRow, int matrixNbCol) };
%apply (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { (int **outMatrix, int *outMatrixNbRow, int *outMatrixNbCol) }; %apply (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT) { (int **outMatrix, int *outMatrixNbRow, int *outMatrixNbCol) };
%inline %{ %inline %{

12
Examples/scilab/matrix2/matrixlib.i
View file

@ -2,14 +2,14 @@
%include matrix.i %include matrix.i
%apply (double *matrixIn, int matrixInRowCount, int matrixInColCount) { (double *inputMatrix, int nbRow, int nbCol) } %apply (double *IN, int IN_ROWCOUNT, int IN_COLCOUNT) { (double *inputMatrix, int nbRow, int nbCol) }
%apply (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { (double **resultMatrix, int *nbRowRes, int *nbColRes) } %apply (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT) { (double **resultMatrix, int *nbRowRes, int *nbColRes) }
%apply (int *matrixIn, int matrixInRowCount, int matrixInColCount) { (int *inputMatrix, int nbRow, int nbCol) } %apply (int *IN, int IN_ROWCOUNT, int IN_COLCOUNT) { (int *inputMatrix, int nbRow, int nbCol) }
%apply (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { (int **resultMatrix, int *nbRowRes, int *nbColRes) } %apply (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT) { (int **resultMatrix, int *nbRowRes, int *nbColRes) }
%apply (char **matrixIn, int matrixInSize) { (char **inputVector, int size) } %apply (char **IN, int IN_SIZE) { (char **inputVector, int size) }
%apply (char ***matrixOut, int *matrixOutSize) { (char ***resultVector, int *sizeRes) } %apply (char ***OUT, int *OUT_SIZE) { (char ***resultVector, int *sizeRes) }
%inline %{ %inline %{
extern double sumDoubleMatrix(double *inputMatrix, int nbRow, int nbCol); extern double sumDoubleMatrix(double *inputMatrix, int nbRow, int nbCol);

8
Examples/test-suite/scilab_li_matrix.i
View file

@ -3,10 +3,10 @@
%include matrix.i %include matrix.i
%define %use_matrix_apply(TYPE...) %define %use_matrix_apply(TYPE...)
%apply (TYPE *matrixIn, int matrixInRowCount, int matrixInColCount) { (TYPE *matrix, int nbRow, int nbCol) } %apply (TYPE *IN, int IN_ROWCOUNT, int IN_COLCOUNT) { (TYPE *matrix, int nbRow, int nbCol) }
%apply (TYPE **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { (TYPE **matrixRes, int *nbRowRes, int *nbColRes) } %apply (TYPE **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT) { (TYPE **matrixRes, int *nbRowRes, int *nbColRes) }
%apply (TYPE *matrixIn, int matrixInSize) { (TYPE *matrix, int size) } %apply (TYPE *IN, int IN_SIZE) { (TYPE *matrix, int size) }
%apply (TYPE **matrixOut, int *matrixOutSize) { (TYPE **matrixRes, int *sizeRes) } %apply (TYPE **OUT, int *OUT_SIZE) { (TYPE **matrixRes, int *sizeRes) }
%enddef %enddef
%use_matrix_apply(int); %use_matrix_apply(int);

56
Lib/scilab/scimatrixbool.swg
View file

@ -5,9 +5,9 @@
%include <scibool.swg> %include <scibool.swg>
// in (bool *matrixIn, int matrixInRowCount, int matrixInColCount) // in (bool *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *matrixIn, int matrixInRowCount, int matrixInColCount) %typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
{ {
if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK)
{ {
@ -15,9 +15,9 @@
} }
} }
// in (int matrixInRowCount, int matrixInColCount, bool *matrixIn) // in (int IN_ROWCOUNT, int IN_COLCOUNT, bool *IN)
%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (int matrixInRowCount, int matrixInColCount, bool *matrixIn) %typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (int IN_ROWCOUNT, int IN_COLCOUNT, bool *IN)
{ {
if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK)
{ {
@ -25,9 +25,9 @@
} }
} }
// in (bool *matrixIn, int matrixInSize) // in (bool *IN, int IN_SIZE)
%typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *matrixIn, int matrixInSize) %typemap(in, noblock=1, fragment="SWIG_SciBoolean_AsBoolArrayAndSize") (bool *IN, int IN_SIZE)
{ {
int rowCount; int rowCount;
int colCount; int colCount;
@ -41,9 +41,9 @@
} }
} }
// in (int matrixInSize, bool *matrixIn) // in (int IN_SIZE, bool *IN)
%typemap(in, noblock=1) (int matrixInSize, bool *matrixIn) %typemap(in, noblock=1) (int IN_SIZE, bool *IN)
{ {
int rowCount; int rowCount;
int colCount; int colCount;
@ -57,20 +57,20 @@
} }
} }
// out (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) // out (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
%typemap(in, noblock=1, numinputs=0) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(in, noblock=1, numinputs=0) (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
} }
%typemap(arginit, noblock=1) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(arginit, noblock=1) (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
$1 = (bool**) malloc(sizeof(bool*)); $1 = (bool**) malloc(sizeof(bool*));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
$3 = (int*) malloc(sizeof(int)); $3 = (int*) malloc(sizeof(int));
} }
%typemap(freearg, noblock=1) (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(freearg, noblock=1) (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
free(*$1); free(*$1);
free($1); free($1);
@ -78,7 +78,7 @@
free($3); free($3);
} }
%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK)
{ {
@ -90,20 +90,20 @@
} }
} }
// out (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) // out (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
%typemap(in, noblock=1, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) %typemap(in, noblock=1, numinputs=0) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
{ {
} }
%typemap(arginit, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) %typemap(arginit, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
{ {
$1 = (int*) malloc(sizeof(int)); $1 = (int*) malloc(sizeof(int));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
$3 = (bool**) malloc(sizeof(bool*)); $3 = (bool**) malloc(sizeof(bool*));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *matrixInRowCount, int *matrixInColCount, bool **matrixOut) %typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
{ {
if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK)
{ {
@ -115,7 +115,7 @@
} }
} }
%typemap(freearg, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, bool **matrixOut) %typemap(freearg, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, bool **OUT)
{ {
free($1); free($1);
free($2); free($2);
@ -124,19 +124,19 @@
} }
// out (bool **matrixOut, int *matrixOutSize) // out (bool **OUT, int *OUT_SIZE)
%typemap(in, noblock=1, numinputs=0) (bool **matrixOut, int *matrixOutSize) %typemap(in, noblock=1, numinputs=0) (bool **OUT, int *OUT_SIZE)
{ {
} }
%typemap(arginit, noblock=1) (bool **matrixOut, int *matrixOutSize) %typemap(arginit, noblock=1) (bool **OUT, int *OUT_SIZE)
{ {
$1 = (bool**) malloc(sizeof(bool*)); $1 = (bool**) malloc(sizeof(bool*));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **matrixOut, int *matrixOutSize) %typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (bool **OUT, int *OUT_SIZE)
{ {
if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK)
{ {
@ -148,7 +148,7 @@
} }
} }
%typemap(freearg, noblock=1) (bool **matrixOut, int *matrixOutSize) %typemap(freearg, noblock=1) (bool **OUT, int *OUT_SIZE)
{ {
free(*$1); free(*$1);
free($1); free($1);
@ -156,19 +156,19 @@
} }
// out (int *matrixOutSize, bool **matrixOut) // out (int *OUT_SIZE, bool **OUT)
%typemap(in, noblock=1, numinputs=0) (int *matrixOutSize, bool **matrixOut) %typemap(in, noblock=1, numinputs=0) (int *OUT_SIZE, bool **OUT)
{ {
} }
%typemap(arginit, noblock=1) (int *matrixOutSize, bool **matrixOut) %typemap(arginit, noblock=1) (int *OUT_SIZE, bool **OUT)
{ {
$1 = (int*) malloc(sizeof(int)); $1 = (int*) malloc(sizeof(int));
$2 = (bool**) malloc(sizeof(bool*)); $2 = (bool**) malloc(sizeof(bool*));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *matrixOutSize, bool **matrixOut) %typemap(argout, noblock=1, fragment="SWIG_SciBoolean_FromBoolArrayAndSize") (int *OUT_SIZE, bool **OUT)
{ {
if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) if (SWIG_SciBoolean_FromBoolArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK)
{ {
@ -180,7 +180,7 @@
} }
} }
%typemap(freearg, noblock=1) (int *matrixOutSize, bool **matrixOut) %typemap(freearg, noblock=1) (int *OUT_SIZE, bool **OUT)
{ {
free($1); free($1);
free(*$2); free(*$2);

60
Lib/scilab/scimatrixchar.swg
View file

@ -5,9 +5,9 @@
%include <scichar.swg> %include <scichar.swg>
// in (char **matrixIn, int matrixInRowCount, int matrixInColCount) // in (char **IN, int IN_ROWCOUNT, int IN_COLCOUNT)
%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **matrixIn, int matrixInRowCount, int matrixInColCount) %typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **IN, int IN_ROWCOUNT, int IN_COLCOUNT)
{ {
if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK)
{ {
@ -15,9 +15,9 @@
} }
} }
// in (int matrixInRowCount, int matrixInColCount, char **matrixIn) // in (int IN_ROWCOUNT, int IN_COLCOUNT, char **IN)
%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int matrixInRowCount, int matrixInColCount, char **matrixIn) %typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int IN_ROWCOUNT, int IN_COLCOUNT, char **IN)
{ {
if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK)
{ {
@ -25,9 +25,9 @@
} }
} }
// in (char **matrixIn, int matrixInSize) // in (char **IN, int IN_SIZE)
%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **matrixIn, int matrixInSize) %typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (char **IN, int IN_SIZE)
{ {
int rowCount; int rowCount;
int colCount; int colCount;
@ -41,9 +41,9 @@
} }
} }
// in (int matrixInSize, char **matrixIn) // in (int IN_SIZE, char **IN)
%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int matrixInSize, char **matrixIn) %typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int IN_SIZE, char **IN)
{ {
int rowCount; int rowCount;
int colCount; int colCount;
@ -57,20 +57,20 @@
} }
} }
// out (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) // out (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
%typemap(in, noblock=1, numinputs=0) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(in, noblock=1, numinputs=0) (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
} }
%typemap(arginit, noblock=1) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(arginit, noblock=1) (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
$1 = (char***) malloc(sizeof(char**)); $1 = (char***) malloc(sizeof(char**));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
$3 = (int*) malloc(sizeof(int)); $3 = (int*) malloc(sizeof(int));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK)
{ {
@ -82,7 +82,7 @@
} }
} }
%typemap(freearg, noblock=1) (char ***matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(freearg, noblock=1) (char ***OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
{ {
int i; int i;
@ -95,20 +95,20 @@
free($3); free($3);
} }
// out (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) // out (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
%typemap(in, noblock=1, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) %typemap(in, noblock=1, numinputs=0) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
{ {
} }
%typemap(arginit, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) %typemap(arginit, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
{ {
$1 = (char***) malloc(sizeof(char**)); $1 = (char***) malloc(sizeof(char**));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
$3 = (int**) malloc(sizeof(int*)); $3 = (int**) malloc(sizeof(int*));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) %typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
{ {
if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK)
{ {
@ -120,7 +120,7 @@
} }
} }
%typemap(freearg, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, char ***matrixOut) %typemap(freearg, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, char ***OUT)
{ {
free($1); free($1);
free($2); free($2);
@ -134,19 +134,19 @@
} }
// out (char ***matrixOut, int *matrixOutSize) // out (char ***OUT, int *OUT_SIZE)
%typemap(in, noblock=1, numinputs=0) (char ***matrixOut, int *matrixOutSize) %typemap(in, noblock=1, numinputs=0) (char ***OUT, int *OUT_SIZE)
{ {
} }
%typemap(arginit, noblock=1) (char ***matrixOut, int *matrixOutSize) %typemap(arginit, noblock=1) (char ***OUT, int *OUT_SIZE)
{ {
$1 = (char***) malloc(sizeof(char**)); $1 = (char***) malloc(sizeof(char**));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
} }
%typemap(freearg, noblock=1) (char ***matrixOut, int *matrixOutSize) %typemap(freearg, noblock=1) (char ***OUT, int *OUT_SIZE)
{ {
{ {
int i; int i;
@ -158,7 +158,7 @@
free($2); free($2);
} }
%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***matrixOut, int *matrixOutSize) %typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (char ***OUT, int *OUT_SIZE)
{ {
if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK)
{ {
@ -170,9 +170,9 @@
} }
} }
// in (int matrixInSize, char **matrixIn) // in (int IN_SIZE, char **IN)
%typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int matrixInSize, char **matrixIn) %typemap(in, noblock=1, fragment="SWIG_SciString_AsCharPtrArrayAndSize") (int IN_SIZE, char **IN)
{ {
if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, 1, &$1, &$2, fname) != SWIG_OK) if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, 1, &$1, &$2, fname) != SWIG_OK)
{ {
@ -180,19 +180,19 @@
} }
} }
// out (int *matrixOutSize, char ***matrixOut) // out (int *OUT_SIZE, char ***OUT)
%typemap(in, noblock=1, numinputs=0) (int *matrixOutSize, char ***matrixOut) %typemap(in, noblock=1, numinputs=0) (int *OUT_SIZE, char ***OUT)
{ {
} }
%typemap(arginit, noblock=1) (int *matrixOutSize, char ***matrixOut) %typemap(arginit, noblock=1) (int *OUT_SIZE, char ***OUT)
{ {
$1 = (int*) malloc(sizeof(int)); $1 = (int*) malloc(sizeof(int));
$2 = (char***) malloc(sizeof(char**)); $2 = (char***) malloc(sizeof(char**));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *matrixOutSize, char ***matrixOut) %typemap(argout, noblock=1, fragment="SWIG_SciString_FromCharPtrArrayAndSize") (int *OUT_SIZE, char ***OUT)
{ {
if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) if (SWIG_SciString_FromCharPtrArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK)
{ {
@ -204,7 +204,7 @@
} }
} }
%typemap(freearg, noblock=1) (int *matrixOutSize, char ***matrixOut) %typemap(freearg, noblock=1) (int *OUT_SIZE, char ***OUT)
{ {
free($1); free($1);
{ {

56
Lib/scilab/scimatrixdouble.swg
View file

@ -5,9 +5,9 @@
%include <scidouble.swg> %include <scidouble.swg>
// in (double *matrixIn, int matrixInRowCount, int matrixInColCount) // in (double *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *matrixIn, int matrixInRowCount, int matrixInColCount) %typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
{ {
if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK)
{ {
@ -15,9 +15,9 @@
} }
} }
// in (int matrixInRowCount, int matrixInColCount, double *matrixIn) // in (int IN_ROWCOUNT, int IN_COLCOUNT, double *IN)
%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int matrixInRowCount, int matrixInColCount, double *matrixIn) %typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int IN_ROWCOUNT, int IN_COLCOUNT, double *IN)
{ {
if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK)
{ {
@ -25,9 +25,9 @@
} }
} }
// in (double *matrixIn, int matrixInSize) // in (double *IN, int IN_SIZE)
%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *matrixIn, int matrixInSize) %typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (double *IN, int IN_SIZE)
{ {
int rowCount; int rowCount;
int colCount; int colCount;
@ -41,9 +41,9 @@
} }
} }
// in (int matrixInSize, double *matrixIn) // in (int IN_SIZE, double *IN)
%typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int matrixInSize, double *matrixIn) %typemap(in, noblock=1, fragment="SWIG_SciDouble_AsDoubleArrayAndSize") (int IN_SIZE, double *IN)
{ {
int rowCount; int rowCount;
int colCount; int colCount;
@ -57,20 +57,20 @@
} }
} }
// out (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) // out (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
%typemap(in, noblock=1, numinputs=0) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(in, noblock=1, numinputs=0) (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
} }
%typemap(arginit, noblock=1) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(arginit, noblock=1) (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
$1 = (double**) malloc(sizeof(double*)); $1 = (double**) malloc(sizeof(double*));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
$3 = (int*) malloc(sizeof(int)); $3 = (int*) malloc(sizeof(int));
} }
%typemap(freearg, noblock=1) (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(freearg, noblock=1) (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
free(*$1); free(*$1);
free($1); free($1);
@ -78,7 +78,7 @@
free($3); free($3);
} }
%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK)
{ {
@ -90,20 +90,20 @@
} }
} }
// out (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) // out (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, double **OUT)
%typemap(in, noblock=1, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) %typemap(in, noblock=1, numinputs=0) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, double **OUT)
{ {
} }
%typemap(arginit, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) %typemap(arginit, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, double **OUT)
{ {
$1 = (int*) malloc(sizeof(int)); $1 = (int*) malloc(sizeof(int));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
$3 = (double**) malloc(sizeof(double*)); $3 = (double**) malloc(sizeof(double*));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *matrixInRowCount, int *matrixInColCount, double **matrixOut) %typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *IN_ROWCOUNT, int *IN_COLCOUNT, double **OUT)
{ {
if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK)
{ {
@ -115,7 +115,7 @@
} }
} }
%typemap(freearg, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, double **matrixOut) %typemap(freearg, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, double **OUT)
{ {
free($1); free($1);
free($2); free($2);
@ -124,19 +124,19 @@
} }
// out (double **matrixOut, int *matrixOutSize) // out (double **OUT, int *OUT_SIZE)
%typemap(in, noblock=1, numinputs=0) (double **matrixOut, int *matrixOutSize) %typemap(in, noblock=1, numinputs=0) (double **OUT, int *OUT_SIZE)
{ {
} }
%typemap(arginit, noblock=1) (double **matrixOut, int *matrixOutSize) %typemap(arginit, noblock=1) (double **OUT, int *OUT_SIZE)
{ {
$1 = (double**) malloc(sizeof(double*)); $1 = (double**) malloc(sizeof(double*));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **matrixOut, int *matrixOutSize) %typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (double **OUT, int *OUT_SIZE)
{ {
if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK)
{ {
@ -148,7 +148,7 @@
} }
} }
%typemap(freearg, noblock=1) (double **matrixOut, int *matrixOutSize) %typemap(freearg, noblock=1) (double **OUT, int *OUT_SIZE)
{ {
free(*$1); free(*$1);
free($1); free($1);
@ -156,19 +156,19 @@
} }
// out (int *matrixOutSize, double **matrixOut) // out (int *OUT_SIZE, double **OUT)
%typemap(in, noblock=1, numinputs=0) (int *matrixOutSize, double **matrixOut) %typemap(in, noblock=1, numinputs=0) (int *OUT_SIZE, double **OUT)
{ {
} }
%typemap(arginit, noblock=1) (int *matrixOutSize, double **matrixOut) %typemap(arginit, noblock=1) (int *OUT_SIZE, double **OUT)
{ {
$1 = (int*) malloc(sizeof(int)); $1 = (int*) malloc(sizeof(int));
$2 = (double**) malloc(sizeof(double*)); $2 = (double**) malloc(sizeof(double*));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *matrixOutSize, double **matrixOut) %typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromDoubleArrayAndSize") (int *OUT_SIZE, double **OUT)
{ {
if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) if (SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK)
{ {
@ -180,7 +180,7 @@
} }
} }
%typemap(freearg, noblock=1) (int *matrixOutSize, double **matrixOut) %typemap(freearg, noblock=1) (int *OUT_SIZE, double **OUT)
{ {
free($1); free($1);
free(*$2); free(*$2);

56
Lib/scilab/scimatrixint.swg
View file

@ -5,9 +5,9 @@
%include <sciint.swg> %include <sciint.swg>
// in (int *matrixIn, int matrixInRowCount, int matrixInColCount) // in (int *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *matrixIn, int matrixInRowCount, int matrixInColCount) %typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *IN, int IN_ROWCOUNT, int IN_COLCOUNT)
{ {
if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK) if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$2, &$3, &$1, fname) != SWIG_OK)
{ {
@ -16,9 +16,9 @@
} }
// in (int matrixInRowCount, int matrixInColCount, int *matrixIn) // in (int IN_ROWCOUNT, int IN_COLCOUNT, int *IN)
%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int matrixInRowCount, int matrixInColCount, int *matrixIn) %typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int IN_ROWCOUNT, int IN_COLCOUNT, int *IN)
{ {
if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK) if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &$1, &$2, &$3, fname) != SWIG_OK)
{ {
@ -27,9 +27,9 @@
} }
// in (int *matrixIn, int matrixInSize) // in (int *IN, int IN_SIZE)
%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *matrixIn, int matrixInSize) %typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int *IN, int IN_SIZE)
{ {
int rowCount; int rowCount;
int colCount; int colCount;
@ -44,9 +44,9 @@
} }
// in (int matrixInSize, int *matrixIn) // in (int IN_SIZE, int *IN)
%typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int matrixInSize, int *matrixIn) %typemap(in, noblock=1, fragment="SWIG_SciDoubleOrInt32_AsIntArrayAndSize") (int IN_SIZE, int *IN)
{ {
int rowCount; int rowCount;
int colCount; int colCount;
@ -60,20 +60,20 @@
} }
} }
// out (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) // out (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
%typemap(in, noblock=1, numinputs=0) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(in, noblock=1, numinputs=0) (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
} }
%typemap(arginit, noblock=1) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(arginit, noblock=1) (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
$1 = (int**) malloc(sizeof(int*)); $1 = (int**) malloc(sizeof(int*));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
$3 = (int*) malloc(sizeof(int)); $3 = (int*) malloc(sizeof(int));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK) if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$2, *$3, *$1) == SWIG_OK)
{ {
@ -85,7 +85,7 @@
} }
} }
%typemap(freearg, noblock=1) (int **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) %typemap(freearg, noblock=1) (int **OUT, int *OUT_ROWCOUNT, int *OUT_COLCOUNT)
{ {
free(*$1); free(*$1);
free($1); free($1);
@ -94,20 +94,20 @@
} }
// out (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) // out (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
%typemap(in, noblock=1, numinputs=0) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) %typemap(in, noblock=1, numinputs=0) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
{ {
} }
%typemap(arginit, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) %typemap(arginit, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
{ {
$1 = (int*) malloc(sizeof(int)); $1 = (int*) malloc(sizeof(int));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
$3 = (int**) malloc(sizeof(int*)); $3 = (int**) malloc(sizeof(int*));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) %typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
{ {
if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK) if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), *$1, *$2, *$3) == SWIG_OK)
{ {
@ -119,7 +119,7 @@
} }
} }
%typemap(freearg, noblock=1) (int *matrixOutRowCount, int *matrixOutColCount, int **matrixOut) %typemap(freearg, noblock=1) (int *OUT_ROWCOUNT, int *OUT_COLCOUNT, int **OUT)
{ {
free($1); free($1);
free($2); free($2);
@ -128,19 +128,19 @@
} }
// out (int **matrixOut, int *matrixOutSize) // out (int **OUT, int *OUT_SIZE)
%typemap(in, noblock=1, numinputs=0) (int **matrixOut, int *matrixOutSize) %typemap(in, noblock=1, numinputs=0) (int **OUT, int *OUT_SIZE)
{ {
} }
%typemap(arginit) (int **matrixOut, int *matrixOutSize) %typemap(arginit) (int **OUT, int *OUT_SIZE)
{ {
$1 = (int**) malloc(sizeof(int*)); $1 = (int**) malloc(sizeof(int*));
$2 = (int*) malloc(sizeof(int)); $2 = (int*) malloc(sizeof(int));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **matrixOut, int *matrixOutSize) %typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int **OUT, int *OUT_SIZE)
{ {
if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK) if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$2, *$1) == SWIG_OK)
{ {
@ -152,7 +152,7 @@
} }
} }
%typemap(freearg, noblock=1) (int **matrixOut, int *matrixOutSize) %typemap(freearg, noblock=1) (int **OUT, int *OUT_SIZE)
{ {
free(*$1); free(*$1);
free($1); free($1);
@ -160,19 +160,19 @@
} }
// out (int *matrixOutSize, int **matrixOut) // out (int *OUT_SIZE, int **OUT)
%typemap(in, noblock=1, numinputs=0) (int *matrixOutSize, int **matrixOut) %typemap(in, noblock=1, numinputs=0) (int *OUT_SIZE, int **OUT)
{ {
} }
%typemap(arginit, noblock=1) (int *matrixOutSize, int **matrixOut) %typemap(arginit, noblock=1) (int *OUT_SIZE, int **OUT)
{ {
$1 = (int*) malloc(sizeof(int)); $1 = (int*) malloc(sizeof(int));
$2 = (int**) malloc(sizeof(int*)); $2 = (int**) malloc(sizeof(int*));
} }
%typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *matrixOutSize, int **matrixOut) %typemap(argout, noblock=1, fragment="SWIG_SciDouble_FromIntArrayAndSize") (int *OUT_SIZE, int **OUT)
{ {
if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK) if (SWIG_SciDouble_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, *$1, *$2) == SWIG_OK)
{ {
@ -184,7 +184,7 @@
} }
} }
%typemap(freearg, noblock=1) (int *matrixInSize, int **matrixOut) %typemap(freearg, noblock=1) (int *IN_SIZE, int **OUT)
{ {
free($1); free($1);
free(*$2); free(*$2);