Mercurial > octave-nkf
changeset 13306:ad9b78544a22
strtrunc.m: Add input validation and tests for length argument n.
* strtrunc.m: Add input validation and tests for length argument n.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sun, 09 Oct 2011 12:58:59 -0700 |
| parents | 63463570d9fe |
| children | cbdefe0ec514 3f3aa11aca41 |
| files | scripts/strings/strtrunc.m |
| diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/strings/strtrunc.m Sun Oct 09 07:25:07 2011 -0700 +++ b/scripts/strings/strtrunc.m Sun Oct 09 12:58:59 2011 -0700 @@ -30,6 +30,11 @@ print_usage (); endif + n = fix (n); + if (! isscalar (n) || n < 0) + error ("strtrunc: length N must be a positive integer (N >= 0)"); + endif + if (ischar (s)) if (n < columns (s)) s = s(:, 1:n); @@ -38,9 +43,11 @@ ## Convoluted approach converts cellstr to char matrix, trims the character ## matrix using indexing, and then converts back to cellstr with mat2cell. ## This approach is 24X faster than using cellfun with call to strtrunc - idx = cellfun ("size", s, 2) >= n; + idx = cellfun ("size", s, 2) > n; rows = cellfun ("size", s(idx), 1); - s(idx) = mat2cell (char (s(idx))(:, 1:n), rows); + if (! isempty (rows)) + s(idx) = mat2cell (char (s(idx))(:, 1:n), rows); + endif else error ("strtrunc: S must be a character string or a cell array of strings"); endif @@ -52,7 +59,8 @@ %!assert (strtrunc("abcdefg", 10), "abcdefg"); %!assert (strtrunc(char ("abcdef", "fedcba"), 3), ["abc"; "fed"]); %!assert (strtrunc({"abcdef", "fedcba"}, 3), {"abc", "fed"}); -%!assert (strtrunc({"1", "21", "321"}, 1), {"1", "2", "3"}) +%!assert (strtrunc({"", "1", "21", "321"}, 1), {"", "1", "2", "3"}) +%!assert (strtrunc({"1", "", "2"}, 1), {"1", "", "2"}) %!test %! cstr = {"line1"; ["line2"; "line3"]; "line4"}; %! y = strtrunc (cstr, 4); @@ -64,5 +72,7 @@ %!error strtrunc () %!error strtrunc ("abcd") %!error strtrunc ("abcd", 4, 5) +%!error <N must be a positive integer> strtrunc ("abcd", ones (2,2)) +%!error <N must be a positive integer> strtrunc ("abcd", -1) %!error <S must be a character string or a cell array of strings> strtrunc (1, 1)