Mercurial > octave

diff libinterp/corefcn/pr-output.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 f90c8372b7ba
children f428cbe7576f
line wrap: on
line diff
--- a/libinterp/corefcn/pr-output.cc	Thu Dec 03 18:33:00 2015 -0500
+++ b/libinterp/corefcn/pr-output.cc	Thu Dec 03 19:22:54 2015 -0500
@@ -3431,55 +3431,53 @@
 
   if (nargin < 1 || nargin > 2 || nargout > 1)
     print_usage ();
-  else
+
+  unwind_protect frame;
+
+  frame.protect_var (rat_string_len);
+
+  rat_string_len = 9;
+
+  if (nargin == 2)
+    rat_string_len = args(1).nint_value ();
+
+  octave_value arg = args(0);
+
+  if (arg.is_numeric_type ())
     {
-      unwind_protect frame;
-
-      frame.protect_var (rat_string_len);
-
-      rat_string_len = 9;
-
-      if (nargin == 2)
-        rat_string_len = args(1).nint_value ();
-
-      octave_value arg = args(0);
-
-      if (arg.is_numeric_type ())
+      frame.protect_var (rat_format);
+
+      rat_format = true;
+
+      std::ostringstream buf;
+      arg.print (buf);
+      std::string s = buf.str ();
+
+      std::list<std::string> lst;
+
+      size_t n = 0;
+      size_t s_len = s.length ();
+
+      while (n < s_len)
         {
-          frame.protect_var (rat_format);
-
-          rat_format = true;
-
-          std::ostringstream buf;
-          arg.print (buf);
-          std::string s = buf.str ();
-
-          std::list<std::string> lst;
-
-          size_t n = 0;
-          size_t s_len = s.length ();
-
-          while (n < s_len)
+          size_t m = s.find ('\n',  n);
+
+          if (m == std::string::npos)
+            {
+              lst.push_back (s.substr (n));
+              break;
+            }
+          else
             {
-              size_t m = s.find ('\n',  n);
-
-              if (m == std::string::npos)
-                {
-                  lst.push_back (s.substr (n));
-                  break;
-                }
-              else
-                {
-                  lst.push_back (s.substr (n, m - n));
-                  n = m + 1;
-                }
+              lst.push_back (s.substr (n, m - n));
+              n = m + 1;
             }
-
-          retval = string_vector (lst);
         }
-      else
-        error ("rats: X must be numeric");
+
+      retval = string_vector (lst);
     }
+  else
+    error ("rats: X must be numeric");
 
   return retval;
 }
@@ -3512,21 +3510,19 @@
 
   int nargin = args.length ();
 
-  if (nargin == 1 && nargout < 2)
+  if (nargin != 1 || nargout > 1)
+    print_usage ();
+
+  octave_value arg = args(0);
+
+  if (nargout == 0)
+    arg.print (octave_stdout);
+  else
     {
-      octave_value arg = args(0);
-
-      if (nargout == 0)
-        arg.print (octave_stdout);
-      else
-        {
-          std::ostringstream buf;
-          arg.print (buf);
-          retval = octave_value (buf.str (), arg.is_dq_string () ? '"' : '\'');
-        }
+      std::ostringstream buf;
+      arg.print (buf);
+      retval = octave_value (buf.str (), arg.is_dq_string () ? '"' : '\'');
     }
-  else
-    print_usage ();
 
   return retval;
 }
@@ -3556,23 +3552,21 @@
 
   int nargin = args.length ();
 
-  if (nargin == 2)
-    {
-      int fid = octave_stream_list::get_file_number (args(0));
-
-      octave_stream os = octave_stream_list::lookup (fid, "fdisp");
-
-      std::ostream *osp = os.output_stream ();
-
-      octave_value arg = args(1);
-
-      if (osp)
-        arg.print (*osp);
-      else
-        error ("fdisp: stream FID not open for writing");
-    }
+  if (nargin != 2)
+    print_usage ();
+
+  int fid = octave_stream_list::get_file_number (args(0));
+
+  octave_stream os = octave_stream_list::lookup (fid, "fdisp");
+
+  std::ostream *osp = os.output_stream ();
+
+  octave_value arg = args(1);
+
+  if (osp)
+    arg.print (*osp);
   else
-    print_usage ();
+    error ("fdisp: stream FID not open for writing");
 
   return retval;
 }