From 6810c0586c019efaea22dc356d92cca7a7aeceb7 Mon Sep 17 00:00:00 2001
From: Simon Marchetto <simon.marchetto@scilab-enterprises.com>
Date: Thu, 22 May 2014 10:07:53 +0200
Subject: [PATCH] scilab: SWIG_AsValDouble relies on SWIG_SciDouble_AsDouble

---
 Lib/scilab/scidouble.swg | 30 +++++++++++++++++-------------
 Lib/scilab/scienum.swg   |  4 ++--
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Lib/scilab/scidouble.swg b/Lib/scilab/scidouble.swg
index d0ea8d60a..ec76ac099 100644
--- a/Lib/scilab/scidouble.swg
+++ b/Lib/scilab/scidouble.swg
@@ -1,30 +1,33 @@
 /*
  * 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
-SWIG_AsVal_dec(double)(SwigSciObject _iVar, double *_pdblValue) {
+SWIG_SciDouble_AsDouble(void *_pvApiCtx, SwigSciObject _iVar, double *_pdblValue, char *_fname) {
   SciErr sciErr;
   int iRet = 0;
   int *piAddrVar = NULL;
 
-  sciErr = getVarAddressFromPosition(pvApiCtx, _iVar, &piAddrVar);
+  sciErr = getVarAddressFromPosition(_pvApiCtx, _iVar, &piAddrVar);
   if (sciErr.iErr) {
     printError(&sciErr, 0);
     return SWIG_ERROR;
   }
 
-  if (!isDoubleType(pvApiCtx, piAddrVar) || isVarComplex(pvApiCtx, piAddrVar)) {
-    Scierror(999, _("%s: Wrong type for input argument #%d: A real expected.\n"), SWIG_Scilab_GetFname(), _iVar);
+  if (!isDoubleType(_pvApiCtx, piAddrVar) || isVarComplex(_pvApiCtx, piAddrVar)) {
+    Scierror(999, _("%s: Wrong type for input argument #%d: A real expected.\n"), _fname, _iVar);
     return SWIG_ERROR;
   }
 
-  if (!isScalar(pvApiCtx, piAddrVar)) {
-    Scierror(999, _("%s: Wrong size for input argument #%d: A real expected.\n"), SWIG_Scilab_GetFname(), _iVar);
+  if (!isScalar(_pvApiCtx, piAddrVar)) {
+    Scierror(999, _("%s: Wrong size for input argument #%d: A real expected.\n"), _fname, _iVar);
     return SWIG_ERROR;
   }
 
-  iRet = getScalarDouble(pvApiCtx, piAddrVar, _pdblValue);
+  iRet = getScalarDouble(_pvApiCtx, piAddrVar, _pdblValue);
   if (iRet) {
     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
-SWIG_From_dec(double)(double _dblValue) {
-  if (createScalarDouble(pvApiCtx, SWIG_NbInputArgument(_pvApiCtx)
-    + SWIG_Scilab_GetOutputPosition(), _dblValue))
+SWIG_SciDouble_FromDouble(void *_pvApiCtx, int _iVarOut, double _dblValue, char *_fname) {
+  if (createScalarDouble(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, _dblValue))
     return SWIG_ERROR;
   return SWIG_OK;
 }
@@ -79,7 +84,6 @@ SWIG_SciDouble_AsDoubleArrayAndSize(void *_pvApiCtx, int _iVar, int *_iRows, int
 SWIGINTERN int
 SWIG_SciDouble_FromDoubleArrayAndSize(void *_pvApiCtx, int _iVarOut, int _iRows, int _iCols, double *_pdblValue) {
   SciErr sciErr;
-
   sciErr = createMatrixOfDouble(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, _iRows, _iCols, _pdblValue);
   if (sciErr.iErr) {
     printError(&sciErr, 0);
diff --git a/Lib/scilab/scienum.swg b/Lib/scilab/scienum.swg
index 35b5347d6..1a09a4785 100644
--- a/Lib/scilab/scienum.swg
+++ b/Lib/scilab/scienum.swg
@@ -6,11 +6,11 @@
 %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())
 }
-%fragment("SWIG_Int_AsEnum", "header", fragment=SWIG_AsVal_frag(int)) {
+%fragment("SWIG_Int_AsEnum", "header", fragment="SWIG_SciDoubleOrInt32_AsInt") {
 SWIGINTERN int
 SWIG_Int_AsEnum(void *_pvApiCtx, int _iVar, int *_enumValue, char *_fname) {
   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;
   *_enumValue = iValue;
   return SWIG_OK;