Mercurial > octave

diff scripts/strings/strsplit.m @ 26073:1ee1ddeee5ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strsplit: don't check only rows because of nd arrays (backout 01da3729016a)
author Carnë Draug <carandraug@octave.org>
date Thu, 15 Nov 2018 11:40:47 +0000
parents 01da3729016a
children 421ea6654fa4
line wrap: on
line diff
--- a/scripts/strings/strsplit.m	Wed Nov 14 10:57:46 2018 -0800
+++ b/scripts/strings/strsplit.m	Thu Nov 15 11:40:47 2018 +0000
@@ -177,7 +177,7 @@
 
   if (! ischar (str) || (! ischar (del) && ! iscellstr (del)))
     error ("strsplit: S and DEL must be string values");
-  elseif (rows (str) > 1)
+  elseif (numel (str) != columns (str))
     error ("strsplit: S must be a char row vector")
   elseif (! isscalar (args.collapsedelimiters))
     error ("strsplit: COLLAPSEDELIMITERS must be a scalar value");
@@ -310,5 +310,6 @@
 %!error <invalid parameter name, 'foo'> strsplit ("abc", "b", "foo", "true")
 %!error <S and DEL must be string values> strsplit (123, "b")
 %!error <S must be a char row vector> strsplit (["abc"; "xyz"])
+%!error <S must be a char row vector> strsplit (reshape ("axbycz", [1 3 2]))
 %!error <COLLAPSEDELIMITERS must be a scalar value> strsplit ("abc", "def", "collapsedelimiters", ones (3,3))
 %!error <Invalid DELIMITERTYPE> strsplit ("abc", "b", "delimitertype", "foobar")