Mercurial > hg > octave-nkf

diff scripts/strings/strsplit.m @ 16712:9ce08a1efc29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix strsplit input validation * strsplit.m: Fix input validation when called with no arguments.
author Mike Miller <mtmiller@ieee.org>
date Sat, 01 Jun 2013 00:30:20 -0400
parents d50bca1cdc22
children 3ce3579405f8
line wrap: on
line diff
--- a/scripts/strings/strsplit.m
+++ b/scripts/strings/strsplit.m
@@ -145,7 +145,9 @@
 
   [reg, params] = parseparams (varargin);
 
-  if (numel (reg) > 1)
+  if (nargin < 1)
+    print_usage ();
+  elseif (numel (reg) > 1)
     print_usage ();
   elseif (numel (reg) == 1)
     if (islogical (reg{1}) || isnumeric (reg{1}))
@@ -196,9 +198,7 @@
     endif
   endif
 
-  if (nargin < 1)
-    print_usage ();
-  elseif (! ischar (str) || (! ischar (del) && ! iscellstr (del)))
+  if (! ischar (str) || (! ischar (del) && ! iscellstr (del)))
     error ("strsplit: S and DEL must be string values");
   elseif (! isscalar (args.collapsedelimiters))
     error ("strsplit: COLLAPSEDELIMITERS must be a scalar value");