scilab: From typemaps do not have to return output argument position

Lib/scilab/scibool.swg

@@ -40,10 +40,10 @@ SWIG_AsVal_dec(bool)(SwigSciObject _iVar, bool *_pbValue) {
 %fragment(SWIG_From_frag(bool), "header") {
 SWIGINTERN int
 SWIG_From_dec(bool)(bool _bValue) {
-  int iVarOut = SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition();
-  if (createScalarBoolean(pvApiCtx, iVarOut, _bValue))
+  if (createScalarBoolean(pvApiCtx, SWIG_NbInputArgument(pvApiCtx)
+    + SWIG_Scilab_GetOutputPosition(), _bValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -89,6 +89,6 @@ SWIG_SciBoolean_FromIntArrayAndSize(void *_pvApiCtx, int _iVarOut, int _iRows, i
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }

Lib/scilab/scichar.swg

@@ -68,7 +68,7 @@ SwigScilabStringFromChar(void *_pvApiCtx, int _iVarOut, char _chValue) {
     return SWIG_ERROR;
 
   free(pchValue);
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -169,7 +169,7 @@ SwigScilabStringFromCharPtr(void *_pvApiCtx, int _iVarOut, const char *_pchValue
 
   free(pstData[0]);
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -243,7 +243,7 @@ SwigScilabStringFromCharPtrArray(void *_pvApiCtx, int _iVarOut, char **_charPtrA
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }
 %fragment(SWIG_CreateScilabVariable_frag(char), "wrapper") {

Lib/scilab/scidouble.swg

@@ -36,10 +36,10 @@ SWIG_AsVal_dec(double)(SwigSciObject _iVar, double *_pdblValue) {
 %fragment(SWIG_From_frag(double), "header") {
 SWIGINTERN int
 SWIG_From_dec(double)(double _dblValue) {
-  int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + SWIG_Scilab_GetOutputPosition();
-  if (createScalarDouble(pvApiCtx, iVarOut, _dblValue))
+  if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(_pvApiCtx)
+    + SWIG_Scilab_GetOutputPosition(), _dblValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -106,12 +106,12 @@ SWIG_SciDouble_FromDoubleArrayAndSize(void *_pvApiCtx, int _iVarOut, int _iRows,
   SciErr sciErr;
 
   sciErr = createMatrixOfDouble(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, _iRows, _iCols, _pdblValue);
-    if (sciErr.iErr) {
-      printError(&sciErr, 0);
-      return SWIG_ERROR;
-    }
+  if (sciErr.iErr) {
+    printError(&sciErr, 0);
+    return SWIG_ERROR;
+  }
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }
 %fragment(SWIG_CreateScilabVariable_frag(double), "wrapper") {

Lib/scilab/scifloat.swg

@@ -16,9 +16,9 @@ SWIG_AsVal_dec(float)(SwigSciObject _iVar, float *_pfValue) {
 %fragment(SWIG_From_frag(float), "header") {
 SWIGINTERN int
 SWIG_From_dec(float)(float _flValue) {
-  int iVarOut = SWIG_NbInputArgument(pvApiCtx) + SWIG_Scilab_GetOutputPosition();
-  if (createScalarDouble(pvApiCtx, iVarOut, (double)_flValue))
+  if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(pvApiCtx)
+    + SWIG_Scilab_GetOutputPosition(), (double)_flValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }

Lib/scilab/sciint.swg

@@ -91,10 +91,10 @@ SWIG_SciDoubleOrInt32_AsInt(void *_pvApiCtx, SwigSciObject _iVar, int *_piValue,
 %fragment("SWIG_SciDouble_FromInt", "header") {
 SWIGINTERN int
 SWIG_SciDouble_FromInt(void *_pvApiCtx, int _iVarOut, int _iValue, char *_fname){
-  int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
-  if (createScalarDouble(_pvApiCtx, iVarOut, (double) _iValue))
+  if (createScalarDouble(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx)
+    + _iVarOut, (double) _iValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -178,7 +178,7 @@ SWIG_SciInt32_FromIntArrayAndSize(void *_pvApiCtx, int _iVarOut, int _iRows, int
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }
 

Lib/scilab/scilong.swg

@@ -90,10 +90,10 @@ SWIG_SciDoubleOrInt32_AsLong(void *_pvApiCtx, SwigSciObject _iVar, long *_plValu
 %fragment("SWIG_SciDouble_FromLong", "header") {
 SWIGINTERN int
 SWIG_SciDouble_FromLong(void *_pvApiCtx, int _iVarOut, long _lValue, char *_fname) {
-  int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
-  if (createScalarDouble(_pvApiCtx, iVarOut, (double) _lValue))
+  if (createScalarDouble(_pvApiCtx,
+    SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, (double) _lValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 

Lib/scilab/scirun.swg

@@ -81,10 +81,10 @@ static void SWIG_Scilab_SetOutputPosition(int _outputPosition) {
 SWIGRUNTIME int
 SWIG_Scilab_SetOutput(void *_pvApiCtx, SwigSciObject _output) {
   int outputPosition = SWIG_Scilab_GetOutputPositionAndReset();
-  if (outputPosition < 0 || _output < 0) {
+  if (outputPosition < 0)
       return SWIG_ERROR;
-  }
-  SWIG_AssignOutputArgument(_pvApiCtx, outputPosition, _output);
+  SWIG_AssignOutputArgument(_pvApiCtx, outputPosition,
+    SWIG_NbInputArgument(_pvApiCtx) + outputPosition);
   return SWIG_OK;
 }
 
@@ -134,7 +134,7 @@ SwigScilabPtrFromObject(void *_pvApiCtx, int _iVarOut, void *_object, swig_type_
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 
 SWIGRUNTIME int
@@ -213,7 +213,7 @@ SWIG_Scilab_NewMemberObj(void *_pvApiCtx, int _iVarOut, void *_ptr, int _sz, swi
   if (createSingleString(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, r))
     return SWIG_ERROR;
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 
 

Lib/scilab/scisequencepointer.swg

@@ -68,7 +68,7 @@ SWIG_FromSet_Sequence_dec(ptr)(int _size, long long *_sequence) {
     }
   }
   delete (int*)_sequence;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 

Lib/scilab/scishort.swg

@@ -90,10 +90,10 @@ SWIG_SciDoubleOrInt16_AsShort(void *_pvApiCtx, int _iVar, short *_psValue, char
 %fragment("SWIG_SciDouble_FromShort", "header") {
 SWIGINTERN int
 SWIG_SciDouble_FromShort(void *_pvApiCtx, int _iVarOut, short _sValue, char *_fname) {
-  int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
-  if (createScalarDouble(_pvApiCtx, iVarOut, (double) _sValue))
+  if (createScalarDouble(_pvApiCtx,
+    SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, (double) _sValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -159,7 +159,7 @@ SWIG_SciInt16_FromShortArrayAndSize(void *_pvApiCtx, int _iVarOut, int _iRows, i
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }
 

Lib/scilab/scisignedchar.swg

@@ -89,10 +89,10 @@ SWIG_SciDoubleOrInt8_AsShort(void *_pvApiCtx, int _iVar, signed char *_pscValue,
 %fragment("SWIG_SciDouble_FromSignedChar", "header") {
 SWIGINTERN int
 SWIG_SciDouble_FromSignedChar(void *_pvApiCtx, int _iVarOut, signed char _scValue) {
-  int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
-  if (createScalarDouble(_pvApiCtx, iVarOut, (double) _scValue))
+  if (createScalarDouble(_pvApiCtx,
+    SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, (double) _scValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -154,6 +154,6 @@ SWIG_SciInt8_FromSignedCharArrayAndSize(void *_pvApiCtx, int _iVarOut, int _iRow
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }

Lib/scilab/sciunsignedchar.swg

@@ -64,10 +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) {
-  int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
-  if (createScalarUnsignedInteger8(pvApiCtx, iVarOut, _ucValue))
+  if (createScalarUnsignedInteger8(pvApiCtx,
+    SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, _ucValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -129,6 +129,6 @@ SWIG_SciUint8_FromUnsignedCharArrayAndSize(void *_pvApiCtx, int _iVarOut, int _i
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }

Lib/scilab/sciunsignedint.swg

@@ -64,10 +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) {
-  int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
-  if (createScalarUnsignedInteger32(_pvApiCtx, iVarOut, _uiValue))
+  if (createScalarUnsignedInteger32(_pvApiCtx,
+    SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, _uiValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -129,7 +129,7 @@ SWIG_SciUint32_FromUnsignedIntArrayAndSize(void *_pvApiCtx, int _iVarOut, int _i
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }
 

Lib/scilab/sciunsignedshort.swg

@@ -67,7 +67,7 @@ SWIG_SciUint16_FromUnsignedShort(void *_pvApiCtx, int _iVarOut, unsigned short _
   int iVarOut = SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
   if (createScalarUnsignedInteger16(_pvApiCtx, iVarOut, _usValue))
     return SWIG_ERROR;
-  return iVarOut;
+  return SWIG_OK;
 }
 }
 
@@ -129,6 +129,6 @@ SWIG_SciUint16_FromUnsignedShortArrayAndSize(void *_pvApiCtx, int _iVarOut, int
     return SWIG_ERROR;
   }
 
-  return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
+  return SWIG_OK;
 }
 }