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

Wrong macro end

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12364 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Vincent Couvert 2011-01-03 15:31:15 +00:00
commit 7c0ef6b047
1 changed files with 251 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

73
Lib/scilab/scitypemaps.swg
View file

@ -4,17 +4,17 @@
/* Basic C types */ /* Basic C types */
%typemap(in) signed char (int iRows, int iCols), %typemap(in) signed char (int iRows, int iCols),
unsigned char (int iRows, int iCols), unsigned char (int iRows, int iCols),
short (int iRows, int iCols), short (int iRows, int iCols),
unsigned short (int iRows, int iCols), unsigned short (int iRows, int iCols),
int (int iRows, int iCols), int (int iRows, int iCols),
unsigned int (int iRows, int iCols), unsigned int (int iRows, int iCols),
long (int iRows, int iCols), long (int iRows, int iCols),
unsigned long (int iRows, int iCols), unsigned long (int iRows, int iCols),
float (int iRows, int iCols), float (int iRows, int iCols),
double (int iRows, int iCols), double (int iRows, int iCols),
long long (int iRows, int iCols), long long (int iRows, int iCols),
unsigned long long (int iRows, int iCols) { unsigned long long (int iRows, int iCols) {
int iType = 0; int iType = 0;
int *piAddrVar = NULL; int *piAddrVar = NULL;
double *_piData = NULL; double *_piData = NULL;
@ -84,9 +84,9 @@
short * (int iRows, int iCols), short * (int iRows, int iCols),
unsigned char * (int iRows, int iCols), unsigned char * (int iRows, int iCols),
unsigned short * (int iRows, int iCols), unsigned short * (int iRows, int iCols),
int * (int iRows, int iCols), int * (int iRows, int iCols),
unsigned int * (int iRows, int iCols), unsigned int * (int iRows, int iCols),
long * (int iRows, int iCols), long * (int iRows, int iCols),
unsigned long * (int iRows, int iCols), unsigned long * (int iRows, int iCols),
double * (int iRows, int iCols), double * (int iRows, int iCols),
float * (int iRows, int iCols), float * (int iRows, int iCols),
@ -399,7 +399,8 @@
$1[ii][jj] = ($1_basetype)_piData[jj * iRows + ii]; $1[ii][jj] = ($1_basetype)_piData[jj * iRows + ii];
} }
} }
} %enddef
%typemap(in) signed char [ANY][ANY] (int iRows, int iCols) { SCILAB_IN_INTEGERMATRIX(char, SCI_INT8, getMatrixOfInteger8) } %typemap(in) signed char [ANY][ANY] (int iRows, int iCols) { SCILAB_IN_INTEGERMATRIX(char, SCI_INT8, getMatrixOfInteger8) }
%typemap(in) unsigned char [ANY][ANY] (int iRows, int iCols) { SCILAB_IN_INTEGERMATRIX(unsigned char, SCI_UINT8, getMatrixOfUnsignedInteger8) } %typemap(in) unsigned char [ANY][ANY] (int iRows, int iCols) { SCILAB_IN_INTEGERMATRIX(unsigned char, SCI_UINT8, getMatrixOfUnsignedInteger8) }
%typemap(in) short [ANY][ANY] (int iRows, int iCols) { SCILAB_IN_INTEGERMATRIX(short, SCI_INT16, getMatrixOfInteger16) } %typemap(in) short [ANY][ANY] (int iRows, int iCols) { SCILAB_IN_INTEGERMATRIX(short, SCI_INT16, getMatrixOfInteger16) }
@ -620,14 +621,14 @@
/* Pointers */ /* Pointers */
%typemap(out, warning="Pointers") signed char * (int iRowsOut, int iColsOut), %typemap(out) signed char * (int iRowsOut, int iColsOut),
short * (int iRowsOut, int iColsOut), short * (int iRowsOut, int iColsOut),
unsigned char * (int iRowsOut, int iColsOut), unsigned char * (int iRowsOut, int iColsOut),
unsigned short * (int iRowsOut, int iColsOut), unsigned short * (int iRowsOut, int iColsOut),
int * (int iRowsOut, int iColsOut), int * (int iRowsOut, int iColsOut),
unsigned int * (int iRowsOut, int iColsOut), unsigned int * (int iRowsOut, int iColsOut),
long * (int iRowsOut, int iColsOut), long * (int iRowsOut, int iColsOut),
unsigned long * (int iRowsOut, int iColsOut), unsigned long * (int iRowsOut, int iColsOut),
double * (int iRowsOut, int iColsOut), double * (int iRowsOut, int iColsOut),
float * (int iRowsOut, int iColsOut), float * (int iRowsOut, int iColsOut),
long long * (int iRowsOut, int iColsOut), long long * (int iRowsOut, int iColsOut),
@ -719,15 +720,15 @@
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
%typemap(varin,noblock=1) signed char, %typemap(varin,noblock=1) signed char,
unsigned char, unsigned char,
short, short,
unsigned short, unsigned short,
int, int,
unsigned int, unsigned int,
long, long,
unsigned long, unsigned long,
float, float,
double, double,
long long, long long,
unsigned long long { unsigned long long {
int iType = 0; int iType = 0;
@ -953,9 +954,9 @@
unsigned char *, unsigned char *,
unsigned short *, unsigned short *,
int *, int *,
unsigned int *, unsigned int *,
long *, long *,
unsigned long *, unsigned long *,
double *, double *,
float *, float *,
long long *, long long *,
@ -1545,11 +1546,11 @@
/* * TODO: add an option to select default integers mapping? */ /* * TODO: add an option to select default integers mapping? */
/* C-integers mapped to Scilab sci_matrix (TODO: add int64 & uint64 for Scilab 6) */ /* C-integers mapped to Scilab sci_matrix (TODO: add int64 & uint64 for Scilab 6) */
%typecheck(SWIG_TYPECHECK_INT8_ARRAY) signed char [ANY] { SCILAB_TYPECHECK(sci_matrix) } %typecheck(SWIG_TYPECHECK_INT8_ARRAY) signed char [ANY] { SCILAB_TYPECHECK(sci_matrix) }
//%typecheck(SWIG_TYPECHECK_UINT8_ARRAY) unsigned char [ANY] { SCILAB_TYPECHECK(sci_matrix) } //%typecheck(SWIG_TYPECHECK_UINT8_ARRAY) unsigned char [ANY] { SCILAB_TYPECHECK(sci_matrix) }
%typecheck(SWIG_TYPECHECK_INT16_ARRAY) short [ANY] { SCILAB_TYPECHECK(sci_matrix) } %typecheck(SWIG_TYPECHECK_INT16_ARRAY) short [ANY] { SCILAB_TYPECHECK(sci_matrix) }
//%typecheck(SWIG_TYPECHECK_UINT16_ARRAY) unsigned short [ANY] { SCILAB_TYPECHECK(sci_matrix) } //%typecheck(SWIG_TYPECHECK_UINT16_ARRAY) unsigned short [ANY] { SCILAB_TYPECHECK(sci_matrix) }
%typecheck(SWIG_TYPECHECK_INT32_ARRAY) int [ANY], long [ANY] { SCILAB_TYPECHECK(sci_matrix) } %typecheck(SWIG_TYPECHECK_INT32_ARRAY) int [ANY], long [ANY] { SCILAB_TYPECHECK(sci_matrix) }
//%typecheck(SWIG_TYPECHECK_UINT32_ARRAY) unsigned int [ANY], unsigned long [ANY] { SCILAB_TYPECHECK(sci_matrix) } //%typecheck(SWIG_TYPECHECK_UINT32_ARRAY) unsigned int [ANY], unsigned long [ANY] { SCILAB_TYPECHECK(sci_matrix) }
/* C-integers mapped to Scilab integers (TODO: add int64 & uint64 for Scilab 6) */ /* C-integers mapped to Scilab integers (TODO: add int64 & uint64 for Scilab 6) */
/* /*
@ -1569,5 +1570,3 @@
/* size_t mapped as int */ /* size_t mapped as int */
/* -----------------------------------------------------------------------------*/ /* -----------------------------------------------------------------------------*/
%apply int { size_t }; %apply int { size_t };