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

fix matrix input issue

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12124 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Baozeng Ding 2010-06-15 11:57:06 +00:00
commit e16a959732
6 changed files with 317 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Source/Modules/scilab.cxx
View file

@ -281,10 +281,10 @@ public:
String *outarg = NewString("");
for (p = l; p;) {
if ((tm = Getattr(p, "tmap:argout"))) {
if (out_required > 0) {
Printf(f->code, "LhsVar(iOutNum) = iVarOut;\n");
Printf(f->code,"iOutNum ++;\niVarOut ++;\n");
}
//if (out_required > 0) {
// Printf(f->code, "LhsVar(iOutNum) = iVarOut;\n");
// Printf(f->code,"iOutNum ++;\niVarOut ++;\n");
//}
Printv(outarg, tm, "\n", NIL);
p = Getattr(p, "tmap:argout:next");
out_required ++;
@ -331,6 +331,8 @@ public:
flag = 1;
}
/* Insert the code checking the number of input */
Printf(f->def, "CheckRhs(%d, %d);\n",num_required,num_arguments);
Printf(f->def, "CheckLhs(%d, %d);\n",out_required,out_required);
@ -339,10 +341,13 @@ public:
/* Insert the order of output parameters*/
if (flag)
Printf(f->def, "\nint iOutNum = 1;\nint iVarOut = Rhs + 1;");
/* Insert the argument counter */
Printf(f->def, "\nint scilabArgNumber=0;");
/* Finish the the code for the function */
if (flag)
Printf(f->code, "LhsVar(iOutNum) = iVarOut;\n");
//if (flag)
Printf(f->code, "//PutLhsVar();\n");
Printf(f->code, "return 0;\n");
Printf(f->code, "}\n");
@ -458,6 +463,8 @@ public:
Printf(setf->def, "SciErr sciErr;\n");
/* Add the local variable */
Wrapper_add_local(setf, "piAddrVar", "int *piAddrVar");
/* Insert the argument counter */
Printf(setf->def, "\nint scilabArgNumber=0;");
/* Deal with the set function */
if (is_assignable(n)) {
@ -500,6 +507,8 @@ public:
Printf(getf->def, "SciErr sciErr;\n");
/* Insert the order of output parameters */
Printf(getf->def, "\nint iOutNum=1;\nint iVarOut=Rhs+1;");
/* Insert the argument counter */
Printf(getf->def, "\nint scilabArgNumber=0;");
if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
Replaceall(tm, "$result", name);
@ -572,6 +581,8 @@ public:
Printf(getf->def, "SciErr sciErr;\n");
/* Insert the order of output parameters*/
Printf(getf->def, "\nint iOutNum=1;\nint iVarOut=Rhs+1;");
/* Insert the argument counter */
Printf(getf->def, "\nint scilabArgNumber=0;");
if ((tm = Swig_typemap_lookup("varout", n, name, 0))) {
Replaceall(tm, "$result", value);