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

scilab: fix int typemaps (functions and fragment names)

Browse source
This commit is contained in:
Simon Marchetto 2014-09-29 14:56:28 +02:00
commit 3997b03f4c
6 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/scilab/sciarray.swg
View file

@ -74,32 +74,32 @@
SWIG_SciDouble_FromSignedCharArrayAndSize, signed char);
// Unsigned char
%scilab_array_typemaps(unsigned char, SWIG_SciUint8_AsUnsignedCharArrayAndSize,
SWIG_SciUint8_FromUnsignedCharArrayAndSize, unsigned char);
%scilab_array_typemaps(unsigned char, SWIG_SciDoubleOrUint8_AsUnsignedCharArrayAndSize,
SWIG_SciDouble_FromUnsignedCharArrayAndSize, unsigned char);
// Short
%scilab_array_typemaps(short, SWIG_SciDoubleOrInt16_AsShortArrayAndSize,
SWIG_SciDouble_FromShortArrayAndSize, short);
// Unsigned short
%scilab_array_typemaps(unsigned short, SWIG_SciUint16_AsUnsignedShortArrayAndSize,
SWIG_SciUint16_FromUnsignedShortArrayAndSize, unsigned short);
%scilab_array_typemaps(unsigned short, SWIG_SciDoubleOrUint16_AsUnsignedShortArrayAndSize,
SWIG_SciDouble_FromUnsignedShortArrayAndSize, unsigned short);
// Int
%scilab_array_typemaps(int, SWIG_SciDoubleOrInt32_AsIntArrayAndSize,
SWIG_SciDouble_FromIntArrayAndSize, int);
// Unsigned int
%scilab_array_typemaps(unsigned int, SWIG_SciUint32_AsUnsignedIntArrayAndSize,
SWIG_SciUint32_FromUnsignedIntArrayAndSize, unsigned int);
%scilab_array_typemaps(unsigned int, SWIG_SciDoubleOrUint32_AsUnsignedIntArrayAndSize,
SWIG_SciDouble_FromUnsignedIntArrayAndSize, unsigned int);
// Long
%scilab_array_typemaps(long, SWIG_SciDoubleOrInt32_AsIntArrayAndSize,
SWIG_SciDouble_FromLongArrayAndSize, int);
// Unsigned long
%scilab_array_typemaps(unsigned long, SWIG_SciUint32_AsUnsignedIntArrayAndSize,
SWIG_SciUint32_FromUnsignedLongArrayAndSize, unsigned int);
%scilab_array_typemaps(unsigned long, SWIG_SciDoubleOrUint32_AsUnsignedIntArrayAndSize,
SWIG_SciDouble_FromUnsignedLongArrayAndSize, unsigned int);
// Float
%scilab_array_typemaps(float, SWIG_SciDouble_AsFloatArrayAndSize,

10
Lib/scilab/scisignedchar.swg
View file

@ -1,13 +1,13 @@
/*
* C-type: signed char
* Scilab type: int8
* Scilab type: double or int8
*/
%fragment(SWIG_AsVal_frag(signed char), "header", fragment="SWIG_SciDoubleOrInt8_AsShort", fragment="<limits.h>") {
#define SWIG_AsVal_signed_SS_char(scilabValue, valuePointer) SWIG_SciDoubleOrInt8_AsShort(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
%fragment(SWIG_AsVal_frag(signed char), "header", fragment="SWIG_SciDoubleOrInt8_AsSignedChar", fragment="<limits.h>") {
#define SWIG_AsVal_signed_SS_char(scilabValue, valuePointer) SWIG_SciDoubleOrInt8_AsSignedChar(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
}
%fragment("SWIG_SciDoubleOrInt8_AsShort", "header") {
%fragment("SWIG_SciDoubleOrInt8_AsSignedChar", "header") {
SWIGINTERN int
SWIG_SciDoubleOrInt8_AsShort(void *pvApiCtx, int iVar, signed char *pscValue, char *fname) {
SWIG_SciDoubleOrInt8_AsSignedChar(void *pvApiCtx, int iVar, signed char *pscValue, char *fname) {
SciErr sciErr;
int iType = 0;
int iRows = 0;

28
Lib/scilab/sciunsignedchar.swg
View file

@ -1,13 +1,13 @@
/*
* C-type: unsigned char
* Scilab type: double or uint8 scalar
* Scilab type: double or uint8
*/
%fragment(SWIG_AsVal_frag(unsigned char), "header", fragment="SWIG_SciUint8_AsUnsignedChar", fragment="<limits.h>") {
#define SWIG_AsVal_unsigned_SS_char(scilabValue, valuePointer) SWIG_SciUint8_AsUnsignedChar(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
%fragment(SWIG_AsVal_frag(unsigned char), "header", fragment="SWIG_SciDoubleOrUint8_AsUnsignedChar", fragment="<limits.h>") {
#define SWIG_AsVal_unsigned_SS_char(scilabValue, valuePointer) SWIG_SciDoubleOrUint8_AsUnsignedChar(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
}
%fragment("SWIG_SciUint8_AsUnsignedChar", "header") {
%fragment("SWIG_SciDoubleOrUint8_AsUnsignedChar", "header") {
SWIGINTERN int
SWIG_SciUint8_AsUnsignedChar(void *pvApiCtx, int iVar, unsigned char *pucValue, char *fname) {
SWIG_SciDoubleOrUint8_AsUnsignedChar(void *pvApiCtx, int iVar, unsigned char *pucValue, char *fname) {
SciErr sciErr;
int iType = 0;
int iRows = 0;
@ -86,12 +86,12 @@ SWIG_SciUint8_AsUnsignedChar(void *pvApiCtx, int iVar, unsigned char *pucValue,
}
}
%fragment(SWIG_From_frag(unsigned char), "header", fragment="SWIG_SciUint8_FromUnsignedChar") {
#define SWIG_From_unsigned_SS_char(value) SWIG_SciUint8_FromUnsignedChar(pvApiCtx, SWIG_Scilab_GetOutputPosition(), value)
%fragment(SWIG_From_frag(unsigned char), "header", fragment="SWIG_SciDouble_FromUnsignedChar") {
#define SWIG_From_unsigned_SS_char(value) SWIG_SciDouble_FromUnsignedChar(pvApiCtx, SWIG_Scilab_GetOutputPosition(), value)
}
%fragment("SWIG_SciUint8_FromUnsignedChar", "header") {
%fragment("SWIG_SciDouble_FromUnsignedChar", "header") {
SWIGINTERN int
SWIG_SciUint8_FromUnsignedChar(void *pvApiCtx, int iVarOut, unsigned char ucValue) {
SWIG_SciDouble_FromUnsignedChar(void *pvApiCtx, int iVarOut, unsigned char ucValue) {
if (createScalarDouble(pvApiCtx,
SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) ucValue))
return SWIG_ERROR;
@ -101,11 +101,11 @@ SWIG_SciUint8_FromUnsignedChar(void *pvApiCtx, int iVarOut, unsigned char ucValu
/*
* C-type: unsigned char[]
* Scilab type: uint8 vector
* Scilab type: double or uint8 matrix
*/
%fragment("SWIG_SciUint8_AsUnsignedCharArrayAndSize", "header") {
%fragment("SWIG_SciDoubleOrUint8_AsUnsignedCharArrayAndSize", "header") {
SWIGINTERN int
SWIG_SciUint8_AsUnsignedCharArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned char **pucValue, char *fname) {
SWIG_SciDoubleOrUint8_AsUnsignedCharArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned char **pucValue, char *fname) {
SciErr sciErr;
int iType = 0;
int iPrec = 0;
@ -166,9 +166,9 @@ SWIG_SciUint8_AsUnsignedCharArrayAndSize(void *pvApiCtx, int iVar, int *iRows, i
}
}
%fragment("SWIG_SciUint8_FromUnsignedCharArrayAndSize", "header") {
%fragment("SWIG_SciDouble_FromUnsignedCharArrayAndSize", "header") {
SWIGINTERN int
SWIG_SciUint8_FromUnsignedCharArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const unsigned char *pucValues) {
SWIG_SciDouble_FromUnsignedCharArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const unsigned char *pucValues) {
SciErr sciErr;
double *pdValues = NULL;
int i;

26
Lib/scilab/sciunsignedint.swg
View file

@ -1,13 +1,13 @@
/*
* C-type: unsigned int
* Scilab type: double or uint32 scalar
* Scilab type: double or uint32
*/
%fragment(SWIG_AsVal_frag(unsigned int), "header", fragment="SWIG_SciUint32_AsUnsignedInt", fragment="<limits.h>") {
%#define SWIG_AsVal_unsigned_SS_int(scilabValue, valuePointer) SWIG_SciUint32_AsUnsignedInt(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
%fragment(SWIG_AsVal_frag(unsigned int), "header", fragment="SWIG_SciDoubleOrUint32_AsUnsignedInt", fragment="<limits.h>") {
%#define SWIG_AsVal_unsigned_SS_int(scilabValue, valuePointer) SWIG_SciDoubleOrUint32_AsUnsignedInt(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
}
%fragment("SWIG_SciUint32_AsUnsignedInt", "header") {
%fragment("SWIG_SciDoubleOrUint32_AsUnsignedInt", "header") {
SWIGINTERN int
SWIG_SciUint32_AsUnsignedInt(void *pvApiCtx, int iVar, unsigned int *puiValue, char *fname) {
SWIG_SciDoubleOrUint32_AsUnsignedInt(void *pvApiCtx, int iVar, unsigned int *puiValue, char *fname) {
SciErr sciErr;
int iType = 0;
int iRows = 0;
@ -86,12 +86,12 @@ SWIG_SciUint32_AsUnsignedInt(void *pvApiCtx, int iVar, unsigned int *puiValue, c
}
}
%fragment(SWIG_From_frag(unsigned int), "header", fragment="SWIG_SciUint32_FromUnsignedInt") {
%#define SWIG_From_unsigned_SS_int(scilabValue) SWIG_SciUint32_FromUnsignedInt(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
%fragment(SWIG_From_frag(unsigned int), "header", fragment="SWIG_SciDouble_FromUnsignedInt") {
%#define SWIG_From_unsigned_SS_int(scilabValue) SWIG_SciDouble_FromUnsignedInt(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
}
%fragment("SWIG_SciUint32_FromUnsignedInt", "header") {
%fragment("SWIG_SciDouble_FromUnsignedInt", "header") {
SWIGINTERN int
SWIG_SciUint32_FromUnsignedInt(void *pvApiCtx, int iVarOut, unsigned int uiValue, char *fname) {
SWIG_SciDouble_FromUnsignedInt(void *pvApiCtx, int iVarOut, unsigned int uiValue, char *fname) {
if (createScalarDouble(pvApiCtx,
SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) uiValue))
return SWIG_ERROR;
@ -103,9 +103,9 @@ SWIG_SciUint32_FromUnsignedInt(void *pvApiCtx, int iVarOut, unsigned int uiValue
* C-type: unsigned int[]
* Scilab type: uint32 vector
*/
%fragment("SWIG_SciUint32_AsUnsignedIntArrayAndSize", "header") {
%fragment("SWIG_SciDoubleOrUint32_AsUnsignedIntArrayAndSize", "header") {
SWIGINTERN int
SWIG_SciUint32_AsUnsignedIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned int **puiValue, char *fname) {
SWIG_SciDoubleOrUint32_AsUnsignedIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned int **puiValue, char *fname) {
SciErr sciErr;
int iType = 0;
int iPrec = 0;
@ -166,9 +166,9 @@ SWIG_SciUint32_AsUnsignedIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, i
}
}
%fragment("SWIG_SciUint32_FromUnsignedIntArrayAndSize", "header") {
%fragment("SWIG_SciDouble_FromUnsignedIntArrayAndSize", "header") {
SWIGINTERN int
SWIG_SciUint32_FromUnsignedIntArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, unsigned int *puiValues) {
SWIG_SciDouble_FromUnsignedIntArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, unsigned int *puiValues) {
SciErr sciErr;
double *pdValues = NULL;
int i;

4
Lib/scilab/sciunsignedlong.swg
View file

@ -28,9 +28,9 @@ SWIG_UnsignedInt_FromUnsignedLong(void *pvApiCtx, int iVarOut, unsigned long ulV
}
}
%fragment("SWIG_SciUint32_FromUnsignedLongArrayAndSize", "header") {
%fragment("SWIG_SciDouble_FromUnsignedLongArrayAndSize", "header") {
SWIGINTERN int
SWIG_SciUint32_FromUnsignedLongArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const unsigned long *pulValues) {
SWIG_SciDouble_FromUnsignedLongArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, const unsigned long *pulValues) {
SciErr sciErr;
double *pdValues = NULL;
int i;

26
Lib/scilab/sciunsignedshort.swg
View file

@ -1,13 +1,13 @@
/*
* C-type: unsigned short
* Scilab type: double or uint16 scalar
* Scilab type: double or uint16
*/
%fragment(SWIG_AsVal_frag(unsigned short), "header", fragment="SWIG_SciUint16_AsUnsignedShort", fragment="<limits.h>") {
%#define SWIG_AsVal_unsigned_SS_short(scilabValue, valuePointer) SWIG_SciUint16_AsUnsignedShort(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
%fragment(SWIG_AsVal_frag(unsigned short), "header", fragment="SWIG_SciDoubleOrUint16_AsUnsignedShort", fragment="<limits.h>") {
%#define SWIG_AsVal_unsigned_SS_short(scilabValue, valuePointer) SWIG_SciDoubleOrUint16_AsUnsignedShort(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFuncName())
}
%fragment("SWIG_SciUint16_AsUnsignedShort", "header") {
%fragment("SWIG_SciDoubleOrUint16_AsUnsignedShort", "header") {
SWIGINTERN int
SWIG_SciUint16_AsUnsignedShort(void *pvApiCtx, int iVar, unsigned short *pusValue, char *fname) {
SWIG_SciDoubleOrUint16_AsUnsignedShort(void *pvApiCtx, int iVar, unsigned short *pusValue, char *fname) {
SciErr sciErr;
int iType = 0;
int iRows = 0;
@ -86,12 +86,12 @@ SWIG_SciUint16_AsUnsignedShort(void *pvApiCtx, int iVar, unsigned short *pusValu
}
}
%fragment(SWIG_From_frag(unsigned short), "header", fragment="SWIG_SciUint16_FromUnsignedShort") {
%#define SWIG_From_unsigned_SS_short(scilabValue) SWIG_SciUint16_FromUnsignedShort(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
%fragment(SWIG_From_frag(unsigned short), "header", fragment="SWIG_SciDouble_FromUnsignedShort") {
%#define SWIG_From_unsigned_SS_short(scilabValue) SWIG_SciDouble_FromUnsignedShort(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFuncName())
}
%fragment("SWIG_SciUint16_FromUnsignedShort", "header") {
%fragment("SWIG_SciDouble_FromUnsignedShort", "header") {
SWIGINTERN int
SWIG_SciUint16_FromUnsignedShort(void *pvApiCtx, int iVarOut, unsigned short usValue, char *fname) {
SWIG_SciDouble_FromUnsignedShort(void *pvApiCtx, int iVarOut, unsigned short usValue, char *fname) {
if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, (double) usValue))
return SWIG_ERROR;
return SWIG_OK;
@ -102,9 +102,9 @@ SWIG_SciUint16_FromUnsignedShort(void *pvApiCtx, int iVarOut, unsigned short usV
* C-type: unsigned short[]
* Scilab type: uint16 vector
*/
%fragment("SWIG_SciUint16_AsUnsignedShortArrayAndSize", "header") {
%fragment("SWIG_SciDoubleOrUint16_AsUnsignedShortArrayAndSize", "header") {
SWIGINTERN int
SWIG_SciUint16_AsUnsignedShortArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned short **pusValue, char *fname) {
SWIG_SciDoubleOrUint16_AsUnsignedShortArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int *iCols, unsigned short **pusValue, char *fname) {
SciErr sciErr;
int iType = 0;
int iPrec = 0;
@ -165,9 +165,9 @@ SWIG_SciUint16_AsUnsignedShortArrayAndSize(void *pvApiCtx, int iVar, int *iRows,
}
}
%fragment("SWIG_SciUint16_FromUnsignedShortArrayAndSize", "header") {
%fragment("SWIG_SciDouble_FromUnsignedShortArrayAndSize", "header") {
SWIGINTERN int
SWIG_SciUint16_FromUnsignedShortArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, unsigned short *pusValues) {
SWIG_SciDouble_FromUnsignedShortArrayAndSize(void *pvApiCtx, int iVarOut, int iRows, int iCols, unsigned short *pusValues) {
SciErr sciErr;
double *pdValues = NULL;
int i;