Mercurial > jwe > octave
diff libinterp/octave-value/ov-struct.cc @ 21127:df7891224709
maint: Use "return ovl (...)" in DEFUN macros.
* cellfun.cc, data.cc, debug.cc, defaults.cc, det.cc, dirfns.cc, dlmread.cc,
error.cc, file-io.cc, getrusage.cc, graphics.cc, help.cc, input.cc, inv.cc,
kron.cc, load-path.cc, pager.cc, pinv.cc, rand.cc, strfns.cc, urlwrite.cc,
chol.cc, ov-classdef.cc, ov-struct.cc: Use "return ovl (...)" in DEFUN macros,
rather than "return octave_value (...)".
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 21 Jan 2016 09:47:50 -0800 |
| parents | 95f8c8cdbffe |
| children | fcac5dbbf9ed |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-struct.cc Thu Jan 21 11:24:36 2016 -0500 +++ b/libinterp/octave-value/ov-struct.cc Thu Jan 21 09:47:50 2016 -0800 @@ -1671,8 +1671,6 @@ @seealso{cell2struct, fieldnames, getfield, setfield, rmfield, isfield, orderfields, isstruct, structfun}\n\ @end deftypefn") { - octave_value retval; - int nargin = args.length (); // struct ([]) returns an empty struct. @@ -1684,14 +1682,10 @@ // compatibility with Matlab. if (nargin == 1 && args(0).is_map ()) - return args(0); + return ovl (args(0)); if (nargin == 1 && args(0).is_object ()) - { - retval = args(0).map_value (); - - return retval; - } + return ovl (args(0).map_value ()); if ((nargin == 1 || nargin == 2) && args(0).is_empty () && args(0).is_real_matrix ()) @@ -1700,12 +1694,10 @@ { Array<std::string> cstr = args(1).xcellstr_value ("struct: second argument should be a cell array of field names"); - retval = octave_map (args(0).dims (), cstr); + return ovl (octave_map (args(0).dims (), cstr)); } else - retval = octave_map (args(0).dims ()); - - return retval; + return ovl (octave_map (args(0).dims ())); } // Check for "field", VALUE pairs. @@ -1737,9 +1729,9 @@ } else if (dims != argdims) { - error ("struct: dimensions of parameter %d do not match those of parameter %d", + error ("struct: dimensions of parameter %d " + "do not match those of parameter %d", first_dimensioned_value, i+1); - return retval; } } } @@ -1776,7 +1768,7 @@ map.setfield (key, Cell (dims, args(i+1))); } - return octave_value (map); + return ovl (map); } /*