Mercurial > octave

diff libinterp/octave-value/ov.cc @ 20939:b17fda023ca6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use new C++ archetype in more files. Place input validation first in files. Move declaration of retval down in function to be closer to point of usage. Eliminate else clause after if () error. Use "return ovl()" where it makes sense. * find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc, graphics.cc, help.cc, hess.cc, hex2num.cc, input.cc, kron.cc, load-path.cc, load-save.cc, lookup.cc, mappers.cc, matrix_type.cc, mgorth.cc, nproc.cc, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, profiler.cc, psi.cc, quad.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, chol.cc, colamd.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-java.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-re-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc, octave.cc: Use new C++ archetype in more files.
author Rik <rik@octave.org>
date Fri, 18 Dec 2015 15:37:22 -0800
parents 384ff5aa9437
children 48b2ad5ee801
line wrap: on
line diff
--- a/libinterp/octave-value/ov.cc	Fri Dec 18 16:22:53 2015 -0500
+++ b/libinterp/octave-value/ov.cc	Fri Dec 18 15:37:22 2015 -0800
@@ -2930,7 +2930,7 @@
   if (args.length () != 1)
     print_usage ();
 
-  return octave_value (args(0).byte_size ());
+  return ovl (args(0).byte_size ());
 }
 
 /*
@@ -3049,9 +3049,9 @@
   octave_value arg0 = args(0);
 
   if (type.empty ())
-    retval = arg0;
+    return ovl (arg0);
   else
-    retval = arg0.subsref (type, idx, nargout);
+    return arg0.subsref (type, idx, nargout);
 
   return retval;
 }
@@ -3089,8 +3089,6 @@
 @seealso{subsref, substruct}\n\
 @end deftypefn")
 {
-  octave_value retval;
-
   if (args.length () != 3)
     print_usage ();
 
@@ -3102,8 +3100,7 @@
   if (type.empty ())
     {
       // Regularize a null matrix if stored into a variable.
-
-      retval = args(2).storable_value ();
+      return ovl (args(2).storable_value ());
     }
   else
     {
@@ -3111,10 +3108,8 @@
 
       arg0.make_unique ();
 
-      retval= arg0.subsasgn (type, idx, args(2));
+      return ovl (arg0.subsasgn (type, idx, args(2)));
     }
-
-  return retval;
 }
 
 /*
@@ -3194,7 +3189,7 @@
   if (args.length () != 1)
     print_usage ();
 
-  return octave_value (args(0).is_sq_string ());
+  return ovl (args(0).is_sq_string ());
 }
 
 /*
@@ -3217,7 +3212,7 @@
   if (args.length () != 1)
     print_usage ();
 
-  return octave_value (args(0).is_dq_string ());
+  return ovl (args(0).is_dq_string ());
 }
 
 /*