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

scilab: simplify 'from' integer typemaps: use createScalar* functions

Browse source
This commit is contained in:
Simon Marchetto 2014-01-30 15:01:48 +01:00
commit a8d020f171
9 changed files with 21 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/scilab/scibool.swg
View file

@ -40,14 +40,9 @@ SWIG_AsVal_dec(bool)(SwigSciObject _iVar, bool *_pbValue) {
%fragment(SWIG_From_frag(bool), "header") {
SWIGINTERN int
SWIG_From_dec(bool)(bool _bValue) {
int iRet = 0;
int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + SWIG_Scilab_GetOutputPosition();
iRet = createScalarBoolean(pvApiCtx, iVarOut, _bValue);
if (iRet) {
int iVarOut = SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition();
if (createScalarBoolean(pvApiCtx, iVarOut, _bValue))
return SWIG_ERROR;
}
return iVarOut;
}
}

6
Lib/scilab/scidouble.swg
View file

@ -36,13 +36,9 @@ SWIG_AsVal_dec(double)(SwigSciObject _iVar, double *_pdblValue) {
%fragment(SWIG_From_frag(double), "header") {
SWIGINTERN int
SWIG_From_dec(double)(double _dblValue) {
int iRet;
int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + SWIG_Scilab_GetOutputPosition();
iRet = createScalarDouble(pvApiCtx, iVarOut, _dblValue);
if (iRet) {
if (createScalarDouble(pvApiCtx, iVarOut, _dblValue))
return SWIG_ERROR;
}
return iVarOut;
}
}

13
Lib/scilab/scifloat.swg
View file

@ -16,18 +16,9 @@ SWIG_AsVal_dec(float)(SwigSciObject _iVar, float *_pfValue) {
%fragment(SWIG_From_frag(float), "header") {
SWIGINTERN int
SWIG_From_dec(float)(float _flValue) {
SciErr sciErr;
double dblDoubleValue = (double) _flValue;
int iRowsOut = 1;
int iColsOut = 1;
int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + SWIG_Scilab_GetOutputPosition();
sciErr = createMatrixOfDouble(pvApiCtx, iVarOut, iRowsOut, iColsOut, &dblDoubleValue);
if (sciErr.iErr) {
printError(&sciErr, 0);
int iVarOut = SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition();
if (createScalarDouble(pvApiCtx, iVarOut, (double)_flValue))
return SWIG_ERROR;
}
return iVarOut;
}
}

7
Lib/scilab/sciint.swg
View file

@ -81,11 +81,10 @@ SWIG_SciDoubleOrInt32_AsInt(void *_pvApiCtx, SwigSciObject _iVar, int *_piValue,
SWIGINTERN int
SWIG_SciDouble_FromInt(void *_pvApiCtx, int _iVarOut, int _iValue, char *_fname)
{
if (createScalarDouble(_pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + _iVarOut, (double) _iValue)) {
int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + SWIG_Scilab_GetOutputPosition();
if (createScalarDouble(_pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + _iVarOut, (double) _iValue))
return SWIG_ERROR;
}
return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
return iVarOut;
}
}

2
Lib/scilab/scishort.swg
View file

@ -80,7 +80,7 @@ SWIG_SciInt16_AsShort(void *_pvApiCtx, int _iVar, short *_psValue, char *_fname)
%fragment("SWIG_SciInt16_FromShort", "header", fragment=SWIG_From_frag(int)) {
SWIGINTERN int
SWIG_SciInt16_FromShort(void *_pvApiCtx, int _iVarOut, short _sValue, char *_fname) {
return SWIG_From_dec(int)((int)_sValue);
return SWIG_From_dec(int)((int)_sValue);
}
}

13
Lib/scilab/scisignedchar.swg
View file

@ -64,17 +64,10 @@ SwigScilabInt8ToSignedChar(void *_pvApiCtx, int _iVar, signed char *_pscValue, c
%fragment("SwigScilabInt8FromSignedChar", "header") {
SWIGINTERN int
SwigScilabInt8FromSignedChar(void *_pvApiCtx, int _iVarOut, signed char _scValue) {
SciErr sciErr;
int iRowsOut = 1;
int iColsOut = 1;
sciErr = createMatrixOfInteger8(pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, iRowsOut, iColsOut, (char *)&_scValue);
if (sciErr.iErr) {
printError(&sciErr, 0);
int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
if (createScalarInteger8(pvApiCtx, iVarOut, _scValue))
return SWIG_ERROR;
}
return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
return iVarOut;
}
}

13
Lib/scilab/sciunsignedchar.swg
View file

@ -64,17 +64,10 @@ SWIG_SciUint8_AsUnsignedChar(void *_pvApiCtx, int _iVar, unsigned char *_pucValu
%fragment("SWIG_SciUint8_FromUnsignedChar", "header") {
SWIGINTERN int
SWIG_SciUint8_FromUnsignedChar(void *_pvApiCtx, int _iVarOut, unsigned char _ucValue) {
SciErr sciErr;
int iRowsOut = 1;
int iColsOut = 1;
sciErr = createMatrixOfUnsignedInteger8(pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, iRowsOut, iColsOut, &_ucValue);
if (sciErr.iErr) {
printError(&sciErr, 0);
int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
if (createScalarUnsignedInteger8(pvApiCtx, iVarOut, _ucValue))
return SWIG_ERROR;
}
return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
return iVarOut;
}
}

13
Lib/scilab/sciunsignedint.swg
View file

@ -64,17 +64,10 @@ SWIG_SciUint32_AsUnsignedInt(void *_pvApiCtx, int _iVar, unsigned int *_puiValue
%fragment("SWIG_SciUint32_FromUnsignedInt", "header") {
SWIGINTERN int
SWIG_SciUint32_FromUnsignedInt(void *_pvApiCtx, int _iVarOut, unsigned int _uiValue, char *_fname) {
SciErr sciErr;
int iRowsOut = 1;
int iColsOut = 1;
sciErr = createMatrixOfUnsignedInteger32(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, iRowsOut, iColsOut, &_uiValue);
if (sciErr.iErr) {
printError(&sciErr, 0);
int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
if (createScalarUnsignedInteger32(_pvApiCtx, iVarOut, _uiValue))
return SWIG_ERROR;
}
return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
return iVarOut;
}
}

13
Lib/scilab/sciunsignedshort.swg
View file

@ -64,17 +64,10 @@ SWIG_SciUint16_AsUnsignedShort(void *_pvApiCtx, int _iVar, unsigned short *_pusV
%fragment("SWIG_SciUint16_FromUnsignedShort", "header") {
SWIGINTERN int
SWIG_SciUint16_FromUnsignedShort(void *_pvApiCtx, int _iVarOut, unsigned short _usValue, char *_fname) {
SciErr sciErr;
int iRowsOut = 1;
int iColsOut = 1;
sciErr = createMatrixOfUnsignedInteger16(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, iRowsOut, iColsOut, &_usValue);
if (sciErr.iErr) {
printError(&sciErr, 0);
int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
if (createScalarUnsignedInteger16(_pvApiCtx, iVarOut, _usValue))
return SWIG_ERROR;
}
return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
return iVarOut;
}
}