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

CheckRhs => CheckInputArgument + CheckLhs => CheckOutputArgument

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2012-scilab@13098 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Sylvestre Ledru 2012-05-22 07:02:14 +00:00
commit efcb2aebed
2 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Examples/scilab/matrix2/sci_sumitems.c
View file

@ -12,8 +12,8 @@ int sci_sumitems(char *fname,unsigned long fname_len)
int *piAddr = NULL; int *piAddr = NULL;
double* pdblReal = NULL; double* pdblReal = NULL;
CheckRhs(1,1); CheckInputArgument(pvApiCtx, 1, 1);
CheckLhs(1,1); CheckOutputArgument(pvApiCtx, 1, 1);
SciErr sciErr; SciErr sciErr;
@ -58,14 +58,14 @@ int sci_getValues(char *fname,unsigned long fname_len)
int *piAddr = NULL; int *piAddr = NULL;
double* pdblReal = NULL; double* pdblReal = NULL;
CheckRhs(0,0); CheckInputArgument(pvApiCtx, 0, 0);
CheckLhs(1,1); CheckOutputArgument(pvApiCtx, 1, 1);
SciErr sciErr; SciErr sciErr;
int numberRow, numberCol, i; int numberRow, numberCol, i;
double * matrix=getValues(&numberRow, &numberCol); double * matrix = getValues(&numberRow, &numberCol);
sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, numberRow, numberCol, matrix); sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, numberRow, numberCol, matrix);

21
Source/Modules/scilab.cxx
View file

@ -1,3 +1,4 @@
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* This file is part of SWIG, which is licensed as a whole under version 3 * This file is part of SWIG, which is licensed as a whole under version 3
* (or any later version) of the GNU General Public License. Some additional * (or any later version) of the GNU General Public License. Some additional
@ -255,9 +256,9 @@ public:
int minInputArguments = emit_num_required(functionParamsList); int minInputArguments = emit_num_required(functionParamsList);
int minOutputArguments = 0; int minOutputArguments = 0;
int maxOutputArguments = 0; int maxOutputArguments = 0;
/* Insert calls to CheckRhs and CheckLhs */ /* Insert calls to CheckInputArgument and CheckOutputArgument */
Printf(wrapper->code, "CheckRhs($mininputarguments, $maxinputarguments);\n"); Printf(wrapper->code, "CheckInputArgument(pvApiCtx, $mininputarguments, $maxinputarguments);\n");
Printf(wrapper->code, "CheckLhs($minoutputarguments, $maxoutputarguments);\n"); Printf(wrapper->code, "CheckOutputArgument(pvApiCtx, $minoutputarguments, $maxoutputarguments);\n");
Printf(wrapper->code, "SWIG_Scilab_SetFname(fname);\n"); Printf(wrapper->code, "SWIG_Scilab_SetFname(fname);\n");
for (paramIndex = 0, param = functionParamsList; paramIndex < maxInputArguments; ++paramIndex) { for (paramIndex = 0, param = functionParamsList; paramIndex < maxInputArguments; ++paramIndex) {
@ -367,7 +368,7 @@ public:
/* Final substititions if applicable */ /* Final substititions if applicable */
Replaceall(wrapper->code, "$symname", functionName); Replaceall(wrapper->code, "$symname", functionName);
/* Set CheckLhs and CheckRhs input arguments */ /* Set CheckInputArgument and CheckOutputArgument input arguments */
/* In Scilab there is always one output even if not defined */ /* In Scilab there is always one output even if not defined */
if (minOutputArguments == 0) { if (minOutputArguments == 0) {
maxOutputArguments = 1; maxOutputArguments = 1;
@ -458,8 +459,8 @@ public:
Printv(getFunctionWrapper->def, "int ", getFunctionName, "(char *fname, unsigned long fname_len) {\n", NIL); Printv(getFunctionWrapper->def, "int ", getFunctionName, "(char *fname, unsigned long fname_len) {\n", NIL);
/* Check the number of input and output */ /* Check the number of input and output */
Printf(getFunctionWrapper->def, "CheckRhs(0, 0);\n"); Printf(getFunctionWrapper->def, "CheckInputArgument(0, 0);\n");
Printf(getFunctionWrapper->def, "CheckLhs(1, 1);\n"); Printf(getFunctionWrapper->def, "CheckOutputArgument(1, 1);\n");
String *varoutTypemap = Swig_typemap_lookup("varout", node, origVariableName, 0); String *varoutTypemap = Swig_typemap_lookup("varout", node, origVariableName, 0);
if (varoutTypemap != NULL) { if (varoutTypemap != NULL) {
@ -485,8 +486,8 @@ public:
Printv(setFunctionWrapper->def, "int ", setFunctionName, "(char *fname, unsigned long fname_len) {\n", NIL); Printv(setFunctionWrapper->def, "int ", setFunctionName, "(char *fname, unsigned long fname_len) {\n", NIL);
/* Check the number of input and output */ /* Check the number of input and output */
Printf(setFunctionWrapper->def, "CheckRhs(1, 1);\n"); Printf(setFunctionWrapper->def, "CheckInputArgument(1, 1);\n");
Printf(setFunctionWrapper->def, "CheckLhs(1, 1);\n"); Printf(setFunctionWrapper->def, "CheckOutputArgument(1, 1);\n");
String *varinTypemap = Swig_typemap_lookup("varin", node, origVariableName, 0); String *varinTypemap = Swig_typemap_lookup("varin", node, origVariableName, 0);
if (varinTypemap != NULL) { if (varinTypemap != NULL) {
@ -523,8 +524,8 @@ public:
Printv(getFunctionWrapper->def, "int ", getFunctionName, "(char *fname, unsigned long fname_len) {\n", NIL); Printv(getFunctionWrapper->def, "int ", getFunctionName, "(char *fname, unsigned long fname_len) {\n", NIL);
/* Check the number of input and output */ /* Check the number of input and output */
Printf(getFunctionWrapper->def, "CheckRhs(0, 0);\n"); Printf(getFunctionWrapper->def, "CheckInputArgument(0, 0);\n");
Printf(getFunctionWrapper->def, "CheckLhs(1, 1);\n"); Printf(getFunctionWrapper->def, "CheckOutputArgument(1, 1);\n");
constantTypemap = Swig_typemap_lookup("constcode", node, nodeName, 0); constantTypemap = Swig_typemap_lookup("constcode", node, nodeName, 0);
if (constantTypemap != NULL) { if (constantTypemap != NULL) {