diff --git a/Lib/scilab/scichar.swg b/Lib/scilab/scichar.swg index 6e0047a49..acb14f4c2 100644 --- a/Lib/scilab/scichar.swg +++ b/Lib/scilab/scichar.swg @@ -132,8 +132,7 @@ SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t } // TODO: return SWIG_ERROR if pcValue NULL (now returning SWIG_ERROR fails some typechecks) - if (pcValue) - { + if (pcValue) { *pcValue = pstStrings; } @@ -214,8 +213,7 @@ SWIG_SciString_AsCharPtrArrayAndSize(void *pvApiCtx, int iVar, int *iRows, int * } *charPtrArray = (char**) malloc((*iRows) * (*iCols) * sizeof(char*)); - for(i = 0 ; i < (*iRows) * (*iCols); i++) - { + for(i = 0 ; i < (*iRows) * (*iCols); i++) { (*charPtrArray)[i] = (char*) malloc(sizeof(char) * (piLength[i] + 1)); } diff --git a/Lib/scilab/sciint.swg b/Lib/scilab/sciint.swg index f9be4825e..c9d4f3bc0 100644 --- a/Lib/scilab/sciint.swg +++ b/Lib/scilab/sciint.swg @@ -113,8 +113,7 @@ SWIG_SciDoubleOrInt32_AsIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, in int *piAddrVar = NULL; sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } @@ -125,15 +124,13 @@ SWIG_SciDoubleOrInt32_AsIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, in return SWIG_ERROR; } - if (iType == sci_matrix) - { + if (iType == sci_matrix) { double *pdData = NULL; int size = 0; int i; sciErr = getMatrixOfDouble(pvApiCtx, piAddrVar, iRows, iCols, &pdData); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } @@ -143,29 +140,24 @@ SWIG_SciDoubleOrInt32_AsIntArrayAndSize(void *pvApiCtx, int iVar, int *iRows, in for (i = 0; i < size; i++) (*piValue)[i] = (int) pdData[i]; } - else if (iType == sci_ints) - { + else if (iType == sci_ints) { int iPrec = 0; sciErr = getMatrixOfIntegerPrecision(pvApiCtx, piAddrVar, &iPrec); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } - if (iPrec != SCI_INT32) - { + if (iPrec != SCI_INT32) { Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit signed integer or a double matrix expected.\n"), fname, iVar); return SWIG_ERROR; } sciErr = getMatrixOfInteger32(pvApiCtx, piAddrVar, iRows, iCols, piValue); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } } - else - { + else { Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A 32-bit signed integer or a double matrix expected.\n"), fname, iVar); return SWIG_ERROR; } diff --git a/Lib/scilab/scilist.swg b/Lib/scilab/scilist.swg index 220b01b84..9634182b5 100644 --- a/Lib/scilab/scilist.swg +++ b/Lib/scilab/scilist.swg @@ -11,8 +11,7 @@ SWIG_GetScilabList(SwigSciObject obj, int **piListAddr) SciErr sciErr; sciErr = getVarAddressFromPosition(pvApiCtx, obj, piListAddr); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } @@ -27,15 +26,13 @@ SWIG_GetScilabListSize(SwigSciObject obj, int *piListSize) int *piListAddr; sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piListAddr); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } sciErr = getListItemNumber(pvApiCtx, piListAddr, piListSize); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } @@ -49,15 +46,13 @@ SWIG_GetScilabListAndSize(SwigSciObject obj, int **piListAddr, int *piListSize) SciErr sciErr; sciErr = getVarAddressFromPosition(pvApiCtx, obj, piListAddr); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } sciErr = getListItemNumber(pvApiCtx, *piListAddr, piListSize); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } @@ -73,21 +68,18 @@ SWIG_CheckScilabList(SwigSciObject obj) int iType; sciErr = getVarAddressFromPosition(pvApiCtx, obj, &piListAddr); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } sciErr = getVarType(pvApiCtx, piListAddr, &iType); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } - if ((iType != sci_list) && (iType != sci_tlist) && (iType != sci_mlist)) - { + if ((iType != sci_list) && (iType != sci_tlist) && (iType != sci_mlist)) { Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A list is expected.\n"), SWIG_Scilab_GetFname(), obj); return SWIG_ERROR; } diff --git a/Lib/scilab/scimatrixbool.swg b/Lib/scilab/scimatrixbool.swg index 49fb16099..e607bceca 100644 --- a/Lib/scilab/scimatrixbool.swg +++ b/Lib/scilab/scimatrixbool.swg @@ -9,8 +9,7 @@ %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) { return SWIG_ERROR; } } @@ -19,8 +18,7 @@ %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) { return SWIG_ERROR; } } @@ -31,12 +29,10 @@ { int rowCount; int colCount; - if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) - { + if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) { $2 = rowCount * colCount; } - else - { + else { return SWIG_ERROR; } } @@ -47,12 +43,10 @@ { int rowCount; int colCount; - if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) - { + if (SWIG_SciBoolean_AsBoolArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) { $1 = rowCount * colCount; } - else - { + else { return SWIG_ERROR; } } @@ -80,12 +74,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -105,12 +97,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -138,12 +128,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -170,12 +158,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } diff --git a/Lib/scilab/scimatrixchar.swg b/Lib/scilab/scimatrixchar.swg index eefae8515..f86733ed3 100644 --- a/Lib/scilab/scimatrixchar.swg +++ b/Lib/scilab/scimatrixchar.swg @@ -9,8 +9,7 @@ %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) { return SWIG_ERROR; } } @@ -19,8 +18,7 @@ %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 { return SWIG_ERROR; } } @@ -31,12 +29,10 @@ { int rowCount; int colCount; - if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) - { + if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) { $2 = rowCount * colCount; } - else - { + else { return SWIG_ERROR; } } @@ -47,12 +43,10 @@ { int rowCount; int colCount; - if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) - { + if (SWIG_SciString_AsCharPtrArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) { $1 = rowCount * colCount; } - else - { + else { return SWIG_ERROR; } } @@ -72,12 +66,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -110,12 +102,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -160,12 +150,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -174,8 +162,7 @@ %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) { return SWIG_ERROR; } } @@ -194,12 +181,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } diff --git a/Lib/scilab/scimatrixdouble.swg b/Lib/scilab/scimatrixdouble.swg index 34a051092..8da9ae729 100644 --- a/Lib/scilab/scimatrixdouble.swg +++ b/Lib/scilab/scimatrixdouble.swg @@ -9,8 +9,7 @@ %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) { return SWIG_ERROR; } } @@ -19,8 +18,7 @@ %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) { return SWIG_ERROR; } } @@ -31,12 +29,10 @@ { int rowCount; int colCount; - if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) - { + if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) { $2 = rowCount * colCount; } - else - { + else { return SWIG_ERROR; } } @@ -47,12 +43,10 @@ { int rowCount; int colCount; - if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) - { + if (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) { $1 = rowCount * colCount; } - else - { + else { return SWIG_ERROR; } } @@ -80,12 +74,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -105,12 +97,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -138,12 +128,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -170,12 +158,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } diff --git a/Lib/scilab/scimatrixint.swg b/Lib/scilab/scimatrixint.swg index d3d7af721..5b94fea2e 100644 --- a/Lib/scilab/scimatrixint.swg +++ b/Lib/scilab/scimatrixint.swg @@ -9,8 +9,7 @@ %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) { return SWIG_ERROR; } } @@ -20,8 +19,7 @@ %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) { return SWIG_ERROR; } } @@ -33,12 +31,10 @@ { int rowCount; int colCount; - if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) - { + if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$1, fname) == SWIG_OK) { $2 = rowCount * colCount; } - else - { + else { return SWIG_ERROR; } } @@ -50,12 +46,10 @@ { int rowCount; int colCount; - if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) - { + if (SWIG_SciDoubleOrInt32_AsIntArrayAndSize(pvApiCtx, $input, &rowCount, &colCount, &$2, fname) == SWIG_OK) { $1 = rowCount * colCount; } - else - { + else { return SWIG_ERROR; } } @@ -75,12 +69,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -109,12 +101,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -142,12 +132,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } @@ -174,12 +162,10 @@ %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) { SWIG_Scilab_SetOutput(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition()); } - else - { + else { return SWIG_ERROR; } } diff --git a/Lib/scilab/scisequencebool.swg b/Lib/scilab/scisequencebool.swg index dfdded57a..df903d60f 100644 --- a/Lib/scilab/scisequencebool.swg +++ b/Lib/scilab/scisequencebool.swg @@ -19,12 +19,10 @@ SWIG_AsCheck_Sequence_dec(bool)(SwigSciObject obj) { return SWIG_ERROR; } - if (isBooleanType(pvApiCtx, piAddrVar)) - { + if (isBooleanType(pvApiCtx, piAddrVar)) { return SWIG_OK; } - else - { + else { Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A boolean is expected.\n"), SWIG_Scilab_GetFname(), obj); return SWIG_ERROR; } diff --git a/Lib/scilab/scisequencedouble.swg b/Lib/scilab/scisequencedouble.swg index 50d9886e1..b09fa50bd 100644 --- a/Lib/scilab/scisequencedouble.swg +++ b/Lib/scilab/scisequencedouble.swg @@ -19,12 +19,10 @@ SWIG_AsCheck_Sequence_dec(double)(SwigSciObject obj) { return SWIG_ERROR; } - if (isDoubleType(pvApiCtx, piAddrVar)) - { + if (isDoubleType(pvApiCtx, piAddrVar)) { return SWIG_OK; } - else - { + else { Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A double is expected.\n"), SWIG_Scilab_GetFname(), obj); return SWIG_ERROR; } diff --git a/Lib/scilab/scisequencefloat.swg b/Lib/scilab/scisequencefloat.swg index afdc52629..315742b70 100644 --- a/Lib/scilab/scisequencefloat.swg +++ b/Lib/scilab/scisequencefloat.swg @@ -19,12 +19,10 @@ SWIG_AsCheck_Sequence_dec(float)(SwigSciObject obj) { return SWIG_ERROR; } - if (isDoubleType(pvApiCtx, piAddrVar)) - { + if (isDoubleType(pvApiCtx, piAddrVar)) { return SWIG_OK; } - else - { + else { Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A double is expected.\n"), SWIG_Scilab_GetFname(), obj); return SWIG_ERROR; } diff --git a/Lib/scilab/scisequenceint.swg b/Lib/scilab/scisequenceint.swg index 1e06ed08c..322e0e797 100644 --- a/Lib/scilab/scisequenceint.swg +++ b/Lib/scilab/scisequenceint.swg @@ -26,12 +26,10 @@ SWIG_AsCheck_Sequence_dec(int)(SwigSciObject obj) { return SWIG_ERROR; } - if ((iType == sci_matrix) || (iType == sci_ints)) - { + if ((iType == sci_matrix) || (iType == sci_ints)) { return SWIG_OK; } - else - { + else { Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: An integer is expected.\n"), SWIG_Scilab_GetFname(), obj); return SWIG_ERROR; } diff --git a/Lib/scilab/scisequencepointer.swg b/Lib/scilab/scisequencepointer.swg index 312e7c626..1cba0fd01 100644 --- a/Lib/scilab/scisequencepointer.swg +++ b/Lib/scilab/scisequencepointer.swg @@ -58,17 +58,14 @@ SWIG_FromSet_Sequence_dec(ptr)(int size, uintptr_t *pSequence) { int iVarOut = SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition(); sciErr = createList(pvApiCtx, iVarOut, size, &piListAddr); - if (sciErr.iErr) - { + if (sciErr.iErr) { printError(&sciErr, 0); return SWIG_ERROR; } - for (int i=0; i