Mercurial > octave

diff libinterp/corefcn/sub2ind.cc @ 20801:a542a9bf177e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate return statements after calls to print_usage * graphics.cc, hess.cc, input.cc, kron.cc, load-save.cc, lsode.cc, luinc.cc, matrix_type.cc, md5sum.cc, nproc.cc, pager.cc, pr-output.cc, psi.cc, quadcc.cc, rand.cc, regexp.cc, sighandlers.cc, sqrtm.cc, strfind.cc, sub2ind.cc, sylvester.cc: Eliminate return statements after calls to print_usage.
author John W. Eaton <jwe@octave.org>
date Thu, 03 Dec 2015 19:22:54 -0500
parents ba2367658dc8
children f428cbe7576f
line wrap: on
line diff
--- a/libinterp/corefcn/sub2ind.cc	Thu Dec 03 18:33:00 2015 -0500
+++ b/libinterp/corefcn/sub2ind.cc	Thu Dec 03 19:22:54 2015 -0500
@@ -83,43 +83,38 @@
 @end deftypefn")
 {
   int nargin = args.length ();
-  octave_value retval;
 
   if (nargin < 2)
     print_usage ();
-  else
-    {
-      dim_vector dv = get_dim_vector (args(0), "sub2ind");
-      Array<idx_vector> idxa (dim_vector (nargin-1, 1));
+
+  dim_vector dv = get_dim_vector (args(0), "sub2ind");
+  Array<idx_vector> idxa (dim_vector (nargin-1, 1));
 
-      dv = dv.redim (nargin - 1);
-      for (int j = 0; j < nargin - 1; j++)
+  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 ())
+          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 ());
+            }
         }
-
-      retval = sub2ind (dv, idxa);
+      else
+        error ("sub2ind: subscripts must be numeric");
     }
 
-  return retval;
+  return octave_value (sub2ind (dv, idxa));
 }
 
 /*
@@ -186,30 +181,29 @@
 @seealso{sub2ind}\n\
 @end deftypefn")
 {
+  octave_value_list retval;
+
   int nargin = args.length ();
-  octave_value_list retval;
 
   if (nargin != 2)
     print_usage ();
-  else
-    {
-      dim_vector dv = get_dim_vector (args(0), "ind2sub");
+
+  dim_vector dv = get_dim_vector (args(0), "ind2sub");
 
-      try
-        {
-          idx_vector idx = args(1).index_vector ();
+  try
+    {
+      idx_vector idx = args(1).index_vector ();
 
-          if (nargout > dv.length ())
-            dv = dv.redim (nargout);
+      if (nargout > dv.length ())
+        dv = dv.redim (nargout);
 
-          retval = Array<octave_value> (ind2sub (dv, idx));
-        }
-      catch (const index_exception& e)
-        {
-          std::string idx = e.idx ();
-          std::string msg = e.details ();
-          error ("ind2sub: Invalid index %s. %s", idx.c_str (), msg.c_str ());
-        }
+      retval = Array<octave_value> (ind2sub (dv, idx));
+    }
+  catch (const index_exception& e)
+    {
+      std::string idx = e.idx ();
+      std::string msg = e.details ();
+      error ("ind2sub: Invalid index %s. %s", idx.c_str (), msg.c_str ());
     }
 
   return retval;