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

scilab: SWIG_AsValDouble relies on SWIG_SciDouble_AsDouble

Browse source
This commit is contained in:
Simon Marchetto 2014-05-22 10:07:53 +02:00
commit 6810c0586c
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/scilab/scidouble.swg
View file

@ -1,30 +1,33 @@
/* /*
* DOUBLE SCALAR * DOUBLE SCALAR
*/ */
%fragment(SWIG_AsVal_frag(double), "header") { %fragment(SWIG_AsVal_frag(double), "header", fragment="SWIG_SciDouble_AsDouble") {
%#define SWIG_AsVal_double(scilabValue, valuePointer) SWIG_SciDouble_AsDouble(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFname())
}
%fragment("SWIG_SciDouble_AsDouble", "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(double)(SwigSciObject _iVar, double *_pdblValue) { SWIG_SciDouble_AsDouble(void *_pvApiCtx, SwigSciObject _iVar, double *_pdblValue, char *_fname) {
SciErr sciErr; SciErr sciErr;
int iRet = 0; int iRet = 0;
int *piAddrVar = NULL; int *piAddrVar = NULL;
sciErr = getVarAddressFromPosition(pvApiCtx, _iVar, &piAddrVar); sciErr = getVarAddressFromPosition(_pvApiCtx, _iVar, &piAddrVar);
if (sciErr.iErr) { if (sciErr.iErr) {
printError(&sciErr, 0); printError(&sciErr, 0);
return SWIG_ERROR; return SWIG_ERROR;
} }
if (!isDoubleType(pvApiCtx, piAddrVar) || isVarComplex(pvApiCtx, piAddrVar)) { if (!isDoubleType(_pvApiCtx, piAddrVar) || isVarComplex(_pvApiCtx, piAddrVar)) {
Scierror(999, _("%s: Wrong type for input argument #%d: A real expected.\n"), SWIG_Scilab_GetFname(), _iVar); Scierror(999, _("%s: Wrong type for input argument #%d: A real expected.\n"), _fname, _iVar);
return SWIG_ERROR; return SWIG_ERROR;
} }
if (!isScalar(pvApiCtx, piAddrVar)) { if (!isScalar(_pvApiCtx, piAddrVar)) {
Scierror(999, _("%s: Wrong size for input argument #%d: A real expected.\n"), SWIG_Scilab_GetFname(), _iVar); Scierror(999, _("%s: Wrong size for input argument #%d: A real expected.\n"), _fname, _iVar);
return SWIG_ERROR; return SWIG_ERROR;
} }
iRet = getScalarDouble(pvApiCtx, piAddrVar, _pdblValue); iRet = getScalarDouble(_pvApiCtx, piAddrVar, _pdblValue);
if (iRet) { if (iRet) {
return SWIG_ERROR; return SWIG_ERROR;
} }
@ -33,11 +36,13 @@ SWIG_AsVal_dec(double)(SwigSciObject _iVar, double *_pdblValue) {
} }
} }
%fragment(SWIG_From_frag(double), "header") { %fragment(SWIG_From_frag(double), "header", fragment="SWIG_SciDouble_FromDouble") {
%#define SWIG_From_double(scilabValue) SWIG_SciDouble_FromDouble(pvApiCtx, SWIG_Scilab_GetOutputPosition(), scilabValue, SWIG_Scilab_GetFname())
}
%fragment("SWIG_SciDouble_FromDouble", "header") {
SWIGINTERN int SWIGINTERN int
SWIG_From_dec(double)(double _dblValue) { SWIG_SciDouble_FromDouble(void *_pvApiCtx, int _iVarOut, double _dblValue, char *_fname) {
if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) if (createScalarDouble(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, _dblValue))
+ SWIG_Scilab_GetOutputPosition(), _dblValue))
return SWIG_ERROR; return SWIG_ERROR;
return SWIG_OK; return SWIG_OK;
} }
@ -79,7 +84,6 @@ SWIG_SciDouble_AsDoubleArrayAndSize(void *_pvApiCtx, int _iVar, int *_iRows, int
SWIGINTERN int SWIGINTERN int
SWIG_SciDouble_FromDoubleArrayAndSize(void *_pvApiCtx, int _iVarOut, int _iRows, int _iCols, double *_pdblValue) { SWIG_SciDouble_FromDoubleArrayAndSize(void *_pvApiCtx, int _iVarOut, int _iRows, int _iCols, double *_pdblValue) {
SciErr sciErr; SciErr sciErr;
sciErr = createMatrixOfDouble(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, _iRows, _iCols, _pdblValue); sciErr = createMatrixOfDouble(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, _iRows, _iCols, _pdblValue);
if (sciErr.iErr) { if (sciErr.iErr) {
printError(&sciErr, 0); printError(&sciErr, 0);

4
Lib/scilab/scienum.swg
View file

@ -6,11 +6,11 @@
%fragment(SWIG_AsVal_frag(Enum), "header", fragment="SWIG_Int_AsEnum") { %fragment(SWIG_AsVal_frag(Enum), "header", fragment="SWIG_Int_AsEnum") {
%#define SWIG_AsVal_Enum(scilabValue, valuePointer) SWIG_Int_AsEnum(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFname()) %#define SWIG_AsVal_Enum(scilabValue, valuePointer) SWIG_Int_AsEnum(pvApiCtx, scilabValue, valuePointer, SWIG_Scilab_GetFname())
} }
%fragment("SWIG_Int_AsEnum", "header", fragment=SWIG_AsVal_frag(int)) { %fragment("SWIG_Int_AsEnum", "header", fragment="SWIG_SciDoubleOrInt32_AsInt") {
SWIGINTERN int SWIGINTERN int
SWIG_Int_AsEnum(void *_pvApiCtx, int _iVar, int *_enumValue, char *_fname) { SWIG_Int_AsEnum(void *_pvApiCtx, int _iVar, int *_enumValue, char *_fname) {
int iValue = 0; int iValue = 0;
if (SWIG_AsVal_dec(int)(_iVar, &iValue) != SWIG_OK) if (SWIG_SciDoubleOrInt32_AsInt(_pvApiCtx, _iVar, &iValue, fname) != SWIG_OK)
return SWIG_ERROR; return SWIG_ERROR;
*_enumValue = iValue; *_enumValue = iValue;
return SWIG_OK; return SWIG_OK;