- isfield : check input parameters

 - Add some tests of isfield functions
 - struct : bring precision to the error message

4 files changed, 102 insertions, 7 deletions

diff --git a/scilab/modules/data_structures/macros/isfield.sci b/scilab/modules/data_structures/macros/isfield.sci
index 5635bef..b85f9ef 100644
--- a/scilab/modules/data_structures/macros/isfield.sci
+++ b/scilab/modules/data_structures/macros/isfield.sci
@@ -1,5 +1,6 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ????-2008 - INRIA
+// Copyright (C) 2004 - INRIA
+// Copyright (C) 2009 - DIGITEO - Pierre MARECHAL <pierre.marechal@scilab.org>
 //
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
@@ -7,10 +8,27 @@
 // are also available at
 // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 
+// This function returns TRUE if "field" is a field of the struct "s", FALSE otherwise
 
-function r=isfield(s,field)
-if ~isstruct(s) then
-r=0;return;end
-w=getfield(1,s);
-r=bool2s(or(w(3:$)==field));
+function r = isfield(s,field)
+        
+        r = %f;
+        
+        rhs = argn(2);
+        
+        if rhs <> 2 then
+                error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),"isfield",2));
+        end
+        
+        if ~isstruct(s) then
+                error(msprintf(gettext("%s: Wrong type for input argument #%d: struct array expected.\n"),"isfield",1));
+        end
+        
+        if type(field) <> 10 then
+                error(msprintf(gettext("%s: Wrong type for input argument #%d: A string expected.\n"),"isfield",2));
+        end
+        
+        w = getfield(1,s);
+        r = or(w(3:$)==field);
+        
 endfunction
diff --git a/scilab/modules/data_structures/macros/struct.sci b/scilab/modules/data_structures/macros/struct.sci
index 759d5f7..de41446 100644
--- a/scilab/modules/data_structures/macros/struct.sci
+++ b/scilab/modules/data_structures/macros/struct.sci
@@ -22,7 +22,7 @@ if rhs==0 then
 end
 
 if floor(rhs/2)*2<>rhs then
-  error(msprintf(gettext("%s: Wrong number of input argument(s)."),'struct'));
+  error(msprintf(gettext("%s: Wrong number of input argument(s) : an even number is expected."),"struct"));
 end
 
 nbfields=size(varargin)/2
diff --git a/scilab/modules/data_structures/tests/unit_tests/isfield.dia.ref b/scilab/modules/data_structures/tests/unit_tests/isfield.dia.ref
new file mode 100644
index 0000000..e2cb1f6
--- /dev/null
+++ b/scilab/modules/data_structures/tests/unit_tests/isfield.dia.ref
@@ -0,0 +1,32 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Pierre MARECHAL <pierre.marechal@scilab.org>
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- ENGLISH IMPOSED -->
+// <-- JVM NOT MANDATORY -->
+// unit tests for isfield function
+// =============================================================================
+my_struct = struct("field_1",123,"field_2",456);
+// syntax
+ierr = execstr("isfield()","errcatch");
+if ierr == 0 then bugmes();quit;end
+if lasterror() <> "isfield: Wrong number of input argument(s): 2 expected." then bugmes();quit;end
+ierr = execstr("isfield(my_struct)","errcatch");
+if ierr == 0 then bugmes();quit;end
+if lasterror() <> "isfield: Wrong number of input argument(s): 2 expected." then bugmes();quit;end
+ierr = execstr("isfield(my_struct,''field_1'',''field_2'')","errcatch");
+if ierr == 0 then bugmes();quit;end
+ierr = execstr("isfield(my_struct,2)","errcatch");
+if ierr == 0 then bugmes();quit;end
+if lasterror() <> "isfield: Wrong type for input argument #2: A string expected." then bugmes();quit;end
+my_struct = ["field_1","field_2"];
+ierr = execstr("isfield(my_struct,''field_1'')","errcatch");
+if ierr == 0 then bugmes();quit;end
+if lasterror() <> "isfield: Wrong type for input argument #1: struct array expected." then bugmes();quit;end
+// Fonctionnality
+my_struct = struct("field_1",123,"field_2",456);
+if ~ isfield(my_struct,"field_1") then bugmes();quit;end
+if ~ isfield(my_struct,"field_2") then bugmes();quit;end
+if   isfield(my_struct,"field_3") then bugmes();quit;end
diff --git a/scilab/modules/data_structures/tests/unit_tests/isfield.tst b/scilab/modules/data_structures/tests/unit_tests/isfield.tst
new file mode 100644
index 0000000..b6665b6
--- /dev/null
+++ b/scilab/modules/data_structures/tests/unit_tests/isfield.tst
@@ -0,0 +1,45 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Pierre MARECHAL <pierre.marechal@scilab.org>
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- ENGLISH IMPOSED -->
+// <-- JVM NOT MANDATORY -->
+
+// unit tests for isfield function
+// =============================================================================
+
+my_struct = struct("field_1",123,"field_2",456);
+
+// syntax
+
+ierr = execstr("isfield()","errcatch");
+if ierr == 0 then pause,end
+if lasterror() <> "isfield: Wrong number of input argument(s): 2 expected." then pause, end
+
+ierr = execstr("isfield(my_struct)","errcatch");
+if ierr == 0 then pause,end
+if lasterror() <> "isfield: Wrong number of input argument(s): 2 expected." then pause, end
+
+ierr = execstr("isfield(my_struct,''field_1'',''field_2'')","errcatch");
+if ierr == 0 then pause,end
+
+ierr = execstr("isfield(my_struct,2)","errcatch");
+if ierr == 0 then pause,end
+if lasterror() <> "isfield: Wrong type for input argument #2: A string expected." then pause, end
+
+my_struct = ["field_1","field_2"];
+
+ierr = execstr("isfield(my_struct,''field_1'')","errcatch");
+if ierr == 0 then pause,end
+if lasterror() <> "isfield: Wrong type for input argument #1: struct array expected." then pause, end
+
+// Fonctionnality
+
+my_struct = struct("field_1",123,"field_2",456);
+
+if ~ isfield(my_struct,"field_1") then pause, end
+if ~ isfield(my_struct,"field_2") then pause, end
+if   isfield(my_struct,"field_3") then pause, end