Mercurial > jwe > octave

diff libinterp/corefcn/regexp.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 68e3a747ca02
children f428cbe7576f
line wrap: on
line diff
--- a/libinterp/corefcn/regexp.cc	Thu Dec 03 18:33:00 2015 -0500
+++ b/libinterp/corefcn/regexp.cc	Thu Dec 03 19:22:54 2015 -0500
@@ -861,7 +861,8 @@
 
   if (nargin < 2)
     print_usage ();
-  else if (args(0).is_cell () || args(1).is_cell ())
+
+  if (args(0).is_cell () || args(1).is_cell ())
     retval = octcellregexp (args, (nargout > 0 ? nargout : 1), "regexp");
   else
     retval = octregexp (args, nargout, "regexp");
@@ -1156,7 +1157,8 @@
 
   if (nargin < 2)
     print_usage ();
-  else if (args(0).is_cell () || args(1).is_cell ())
+
+  if (args(0).is_cell () || args(1).is_cell ())
     retval = octcellregexp (args, (nargout > 0 ? nargout : 1), "regexpi", true);
   else
     retval = octregexp (args, nargout, "regexpi", true);
@@ -1388,10 +1390,7 @@
   int nargin = args.length ();
 
   if (nargin < 3)
-    {
-      print_usage ();
-      return retval;
-    }
+    print_usage ();
 
   if (args(0).is_cell () || args(1).is_cell () || args(2).is_cell ())
     {