Mercurial > octave

diff libinterp/corefcn/sparse.cc @ 20803:c22206c1a88f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate return statements after calls to print_usage * __ilu__.cc, besselj.cc, conv2.cc, error.cc, getgrent.cc, getpwent.cc, help.cc, load-path.cc, sparse.cc: Eliminate return statements after calls to print_usage. * mode.m: Fix test.
author John W. Eaton <jwe@octave.org>
date Fri, 04 Dec 2015 14:06:41 -0500
parents 8742e0b1cc49
children 1142cf6abc0d
line wrap: on
line diff
--- a/libinterp/corefcn/sparse.cc	Fri Dec 04 12:03:44 2015 -0500
+++ b/libinterp/corefcn/sparse.cc	Fri Dec 04 14:06:41 2015 -0500
@@ -49,12 +49,9 @@
 @end deftypefn")
 {
   if (args.length () != 1)
-    {
-      print_usage ();
-      return octave_value ();
-    }
-  else
-    return octave_value (args(0).is_sparse_type ());
+    print_usage ();
+
+  return octave_value (args(0).is_sparse_type ());
 }
 
 DEFUN (sparse, args, ,
@@ -128,6 +125,9 @@
   octave_value retval;
   int nargin = args.length ();
 
+  if (nargin == 0 || nargin > 6)
+    print_usage ();
+
   // Temporarily disable sparse_auto_mutate if set (it's obsolete anyway).
   unwind_protect frame;
   frame.protect_var (Vsparse_auto_mutate);
@@ -188,8 +188,6 @@
           if (m < 0 || n < 0)
             error ("sparse: dimensions must be non-negative");
         }
-      else if (nargin != 3)
-        print_usage ();
 
       int k = 0;    // index we're checking when index_vector throws
       try
@@ -260,24 +258,23 @@
 @end deftypefn")
 {
   octave_value retval;
+
   int nargin = args.length ();
 
-  if (nargin == 2 || nargin == 3)
-    {
-      octave_idx_type m = args(0).idx_type_value ();
-      octave_idx_type n = args(1).idx_type_value ();
-      octave_idx_type nz = 0;
+  if (nargin < 2 || nargin > 3)
+    print_usage ();
+
+  octave_idx_type m = args(0).idx_type_value ();
+  octave_idx_type n = args(1).idx_type_value ();
+  octave_idx_type nz = 0;
 
-      if (nargin == 3)
-        nz = args(2).idx_type_value ();
+  if (nargin == 3)
+    nz = args(2).idx_type_value ();
 
-      if (m >= 0 && n >= 0 && nz >= 0)
-        retval = SparseMatrix (dim_vector (m, n), nz);
-      else
-        error ("spalloc: M,N,NZ must be non-negative");
-    }
+  if (m >= 0 && n >= 0 && nz >= 0)
+    retval = SparseMatrix (dim_vector (m, n), nz);
   else
-    print_usage ();
+    error ("spalloc: M,N,NZ must be non-negative");
 
   return retval;
 }