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

scilab: fix allprotected test (scilab 6)

Browse source
This commit is contained in:
Simon Marchetto 2014-06-06 12:03:03 +02:00
commit 9dda9285ea
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Examples/test-suite/scilab/allprotected_runme.sci
View file

@ -17,12 +17,12 @@ catch
end
if PublicBase_virtualMethod(publicBase) <> "PublicBase" then swigtesterror(); end
if Klass_getName(PublicBase_instanceMetho(publicBase, klass)) <> "allprotected_klass" then swigtesterror(); end
if Klass_getName(PublicBase_instanceOverl(publicBase, klass)) <> "allprotected_klass" then swigtesterror(); end
if Klass_getName(PublicBase_instanceOverl(publicBase, klass, "allprotected_klass2")) <> "allprotected_klass2" then swigtesterror(); end
if Klass_getName(PublicBase_instanceMethod(publicBase, klass)) <> "allprotected_klass" then swigtesterror(); end
if Klass_getName(PublicBase_instanceOverloaded(publicBase, klass)) <> "allprotected_klass" then swigtesterror(); end
if Klass_getName(PublicBase_instanceOverloaded(publicBase, klass, "allprotected_klass2")) <> "allprotected_klass2" then swigtesterror(); end
if Klass_getName(PublicBase_staticMethod(klass)) <> "allprotected_klass" then swigtesterror(); end
if Klass_getName(PublicBase_staticOverloa(klass)) <> "allprotected_klass" then swigtesterror(); end
if Klass_getName(PublicBase_staticOverloa(klass, "allprotected_klass3")) <> "allprotected_klass3" then swigtesterror(); end
if Klass_getName(PublicBase_staticOverloaded(klass)) <> "allprotected_klass" then swigtesterror(); end
if Klass_getName(PublicBase_staticOverloaded(klass, "allprotected_klass3")) <> "allprotected_klass3" then swigtesterror(); end
if PublicBase_EnumVal1_get() <> 0 then swigtesterror(); end
if PublicBase_EnumVal2_get() <> 1 then swigtesterror(); end
@ -48,8 +48,8 @@ try
catch
end
if ProtectedBase_EnumVal1_g() <> 0 then swigtesterror(); end
if ProtectedBase_EnumVal2_g() <> 1 then swigtesterror(); end
if ProtectedBase_EnumVal1_get() <> 0 then swigtesterror(); end
if ProtectedBase_EnumVal2_get() <> 1 then swigtesterror(); end
try
delete_Klass(klass);

4
Source/Modules/scilab.cxx
View file

@ -525,10 +525,12 @@ public:
Printf(tmp, "}");
Wrapper_add_local(wrapper, "argv", tmp);
Printf(wrapper->code, "SWIG_Scilab_SetApiContext(pvApiCtx);\n");
/* Dump the dispatch function */
Printv(wrapper->code, dispatch, "\n", NIL);
Printf(wrapper->code, "Scierror(999, _(\"No matching function for overload\"));\n");
Printf(wrapper->code, "return SWIG_OK;\n");
Printf(wrapper->code, "return SWIG_ERROR;\n");
Printv(wrapper->code, "}\n", NIL);
Wrapper_print(wrapper, wrappersSection);