Mercurial > octave

diff libinterp/corefcn/sub2ind.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 1142cf6abc0d
children 48b2ad5ee801
line wrap: on
line diff
--- a/libinterp/corefcn/sub2ind.cc	Fri Dec 18 16:22:53 2015 -0500
+++ b/libinterp/corefcn/sub2ind.cc	Fri Dec 18 15:37:22 2015 -0800
@@ -93,28 +93,26 @@
   dv = dv.redim (nargin - 1);
   for (int j = 0; j < nargin - 1; j++)
     {
-      if (args(j+1).is_numeric_type ())
+      if (! args(j+1).is_numeric_type ())
+        error ("sub2ind: subscripts must be numeric");
+
+      try
         {
-          try
-            {
-              idxa(j) = args(j+1).index_vector ();
+          idxa(j) = args(j+1).index_vector ();
 
-              if (j > 0 && args(j+1).dims () != args(1).dims ())
-                error ("sub2ind: all subscripts must be of the same size");
-            }
-          catch (index_exception& e)
-            {
-              e.set_pos_if_unset (nargin-1, j+1);
-              e.set_var ();
-              std::string msg = e.message ();
-              error_with_id (e.err_id (), msg.c_str ());
-            }
+          if (j > 0 && args(j+1).dims () != args(1).dims ())
+            error ("sub2ind: all subscripts must be of the same size");
         }
-      else
-        error ("sub2ind: subscripts must be numeric");
+      catch (index_exception& e)
+        {
+          e.set_pos_if_unset (nargin-1, j+1);
+          e.set_var ();
+          std::string msg = e.message ();
+          error_with_id (e.err_id (), msg.c_str ());
+        }
     }
 
-  return octave_value (sub2ind (dv, idxa));
+  return ovl (sub2ind (dv, idxa));
 }
 
 /*
@@ -181,11 +179,11 @@
 @seealso{sub2ind}\n\
 @end deftypefn")
 {
-  octave_value_list retval;
-
   if (args.length () != 2)
     print_usage ();
 
+  octave_value_list retval;
+
   dim_vector dv = get_dim_vector (args(0), "ind2sub");
 
   try