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

Do not build 64 bits wrapping if Scilab is not able to manage it (will be the case with Scilab 6)

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12279 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Sylvestre Ledru 2010-10-14 16:26:41 +00:00
commit f603ac10db
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/Modules/scilab.cxx
View file

@ -242,10 +242,11 @@ public:
String *getargs = NewString("");
/* The paremeter is variable */
if (j >= num_required)
if (j >= num_required) {
Printf(getargs, "if (Rhs > %d) {\n%s\n}", j, tm);
else
} else {
Printv(getargs, tm, NIL);
}
Printv(f->code, getargs, "\n", NIL);
if ( Equal(SwigType_base(pt), "long long") || Equal(SwigType_base(pt), "unsigned long long")) {
Printv(f->code, "#endif\n", NIL);
@ -278,8 +279,9 @@ public:
Printf(f->code, "iOutNum ++;\niVarOut ++;\n");
}
Printf(f->code, "%s\n", tm);
if (strlen(Char(tm)) != 0)
if (strlen(Char(tm)) != 0) {
out_required ++;
}
}
else {
Swig_warning(WARN_TYPEMAP_OUT_UNDEF, input_file, line_number, "Unable to use return type %s in function %s.\n", SwigType_str(d, 0), iname);
@ -334,8 +336,7 @@ public:
if (out_required == 0) {
out_required = 1;
flag = 0;
}
else {
} else {
flag = 1;
}
@ -504,13 +505,16 @@ public:
}
Append(setf->code, "}\n");
if ( Equal(SwigType_base(t), "long long") || Equal(SwigType_base(t), "unsigned long long")) {
Printv(setf->def, "#endif\n", NIL);
Printv(setf->code, "#endif\n", NIL);
}
Wrapper_print(setf, f_wrappers);
if (++ function_count % 10 == 0) {
Printf(f_builder_code, "];\n\ntable = [table;");
}
Printf(f_builder_code, "\"%s\",\"%s\";", setname, setname);
if (!( Equal(SwigType_base(t), "long long") || Equal(SwigType_base(t), "unsigned long long"))) {
Printf(f_builder_code, "\"%s\",\"%s\";", setname, setname);
}
/* Deal with the get function */
Setattr(n, "wrap:name", getname);
@ -550,14 +554,16 @@ public:
Printf(getf->code, "LhsVar(iOutNum) = iVarOut;\n");
Append(getf->code, "}\n");
if ( Equal(SwigType_base(t), "long long") || Equal(SwigType_base(t), "unsigned long long")) {
Printv(getf->def, " #endif\n", NIL);
Printv(getf->code, " #endif\n", NIL);
}
Wrapper_print(getf, f_wrappers);
Printf(f_header,"%s", globalVar);
if (++ function_count % 10 == 0) {
Printf(f_builder_code, "];\n\ntable = [table;");
}
Printf(f_builder_code, "\"%s\",\"%s\";", getname, getname);
if (!( Equal(SwigType_base(t), "long long") || Equal(SwigType_base(t), "unsigned long long"))) {
Printf(f_builder_code, "\"%s\",\"%s\";", getname, getname);
}
Delete(rowname);
Delete(colname);