octave-nkf: src/ov-struct.cc comparison

Fisfield: Accept cell arrays as name argument.

author	David Grundberg <davidg@cs.umu.se>
date	Wed, 09 Jun 2010 15:14:31 +0200
parents	9c4daf174387
children	604e13a89c7f

comparison

equal deleted inserted replaced

-:35adf2a71f3f
+:e0ba186b242b
 */
 DEFUN (isfield, args, ,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} isfield (@var{expr}, @var{name})\n\
-Return true if the expression @var{expr} is a structure and it includes an\n\
+Return true if the expression @var{expr} is a structure and it\n\
-element named @var{name}.  The first argument must be a structure and\n\
+includes an element named @var{name}.  If @var{name} is a cell\n\
-the second must be a string.\n\
+array, a logical array of equal dimension is returned.\n\
 @end deftypefn")
 {
 octave_value retval;
 int nargin = args.length ();
 if (nargin == 2)
 {
 retval = false;
-// FIXME -- should this work for all types that can do
+if (args(0).is_map ())
-// structure reference operations?
+{
-if (args(0).is_map () && args(1).is_string ())
-{
-std::string key = args(1).string_value ();
 Octave_map m = args(0).map_value ();
-retval = m.contains (key) != 0;
+// FIXME -- should this work for all types that can do
+// structure reference operations?
+if (args(1).is_string ())
+{
+std::string key = args(1).string_value ();
+retval = m.contains (key) != 0;
+}
+else if (args(1).is_cell ())
+{
+Cell c = args(1).cell_value ();
+boolMatrix bm (c.dims ());
+octave_idx_type n = bm.numel ();
+for (octave_idx_type i = 0; i < n; i++)
+{
+if (c(i).is_string ())
+{
+std::string key = c(i).string_value ();
+bm(i) = m.contains (key) != 0;
+}
+else
+bm(i) = false;
+}
+retval = bm;
+}
 }
 }
 else
 print_usage ();

Mercurial > hg > octave-nkf