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

[project @ 2007-10-03 14:38:48 by jwe]

comparison

equal deleted inserted replaced

-:6bbf56a9718a
+:10c7a803b409
 Singleton cells and non-cell values are repeated so that they fill\n\
 the entire array.  If the cells are empty, create an empty structure\n\
 array with the specified field names.\n\
 @end deftypefn")
 {
-octave_value_list retval;
+octave_value retval;
 int nargin = args.length ();
 // struct ([]) returns an empty struct.
 // dimensions as the empty matrix.
 // Note that struct () creates a 1x1 struct with no fields for
 // compatibility with Matlab.
-if (nargin == 1 && args(0).is_empty () && args(0).is_real_matrix ())
+if ((nargin == 1 || nargin == 2)
-return octave_value (Octave_map (args(0).dims ()));
+&& args(0).is_empty () && args(0).is_real_matrix ())
+{
+Cell fields;
+if (nargin == 2)
+	{
+	  if (args(1).is_cellstr ())
+	    retval = Octave_map (args(0).dims (), args(1).cell_value ());
+	  else
+	    error ("struct: expecting cell array of field names as second argument");
+	}
+else
+	retval = Octave_map (args(0).dims ());
+return retval;
+}
 // Check for "field", VALUE pairs.
 for (int i = 0; i < nargin; i += 2)
 {
 	map.assign (key, Cell (dims, args(i+1)));
 if (error_state)
 	return retval;
 }
 return octave_value (map);
 }
 DEFUN (isstruct, args, ,
 "-*- texinfo -*-\n\

Mercurial > hg > octave-nkf