Mercurial > hg > octave-lyh
annotate scripts/strings/strtrim.m @ 17428:577a19afdaf5
maint: Backed out changeset f81401b6b1f7.
* test/parser.tst: bug #33304 should remain an error until it is fixed.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 14 Sep 2013 17:07:05 -0700 |
parents | f3d52523cde1 |
children |
rev | line source |
---|---|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13159
diff
changeset
|
1 ## Copyright (C) 1996-2012 Kurt Hornik |
6975 | 2 ## |
3 ## This file is part of Octave. | |
4 ## | |
5 ## Octave is free software; you can redistribute it and/or modify it | |
6 ## under the terms of the GNU General Public License as published by | |
7016 | 7 ## the Free Software Foundation; either version 3 of the License, or (at |
8 ## your option) any later version. | |
6975 | 9 ## |
10 ## Octave is distributed in the hope that it will be useful, but | |
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 ## General Public License for more details. | |
14 ## | |
15 ## You should have received a copy of the GNU General Public License | |
7016 | 16 ## along with Octave; see the file COPYING. If not, see |
17 ## <http://www.gnu.org/licenses/>. | |
6975 | 18 |
7346 | 19 ## -*- texinfo -*- |
7666
693ac94c2854
Fixed minor bugs in help texts of [x|y|z]lim and strtrim
sh@sh-laptop
parents:
7346
diff
changeset
|
20 ## @deftypefn {Function File} {} strtrim (@var{s}) |
12876
29cd5a828bb2
strtrim.m: Don't remove nuls (\0) from string.
Rik <octave@nomad.inbox5.com>
parents:
12874
diff
changeset
|
21 ## Remove leading and trailing whitespace from @var{s}. If |
7666
693ac94c2854
Fixed minor bugs in help texts of [x|y|z]lim and strtrim
sh@sh-laptop
parents:
7346
diff
changeset
|
22 ## @var{s} is a matrix, @var{strtrim} trims each row to the length of |
12981
4ec4096f65d1
doc: State that required input is cellstr, not cell, for strtrim and deblank (Bug #34038)
Rik <octave@nomad.inbox5.com>
parents:
12975
diff
changeset
|
23 ## longest string. If @var{s} is a cell array of strings, operate recursively |
4ec4096f65d1
doc: State that required input is cellstr, not cell, for strtrim and deblank (Bug #34038)
Rik <octave@nomad.inbox5.com>
parents:
12975
diff
changeset
|
24 ## on each string element. For example: |
8442
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
25 ## |
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
26 ## @example |
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
27 ## @group |
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
28 ## strtrim (" abc ") |
12981
4ec4096f65d1
doc: State that required input is cellstr, not cell, for strtrim and deblank (Bug #34038)
Rik <octave@nomad.inbox5.com>
parents:
12975
diff
changeset
|
29 ## @result{} "abc" |
8442
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
30 ## |
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
31 ## strtrim ([" abc "; " def "]) |
12981
4ec4096f65d1
doc: State that required input is cellstr, not cell, for strtrim and deblank (Bug #34038)
Rik <octave@nomad.inbox5.com>
parents:
12975
diff
changeset
|
32 ## @result{} ["abc " ; " def"] |
8442
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
33 ## @end group |
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
34 ## @end example |
12981
4ec4096f65d1
doc: State that required input is cellstr, not cell, for strtrim and deblank (Bug #34038)
Rik <octave@nomad.inbox5.com>
parents:
12975
diff
changeset
|
35 ## @seealso{deblank} |
7346 | 36 ## @end deftypefn |
6975 | 37 |
38 ## Author: John Swensen <jpswensen@jhu.edu> | |
39 | |
40 ## This function was derived from deblank. | |
41 | |
13159
a8184fb6b0c7
strtrim.m: Rename function inside .m file to match filename.
Rik <octave@nomad.inbox5.com>
parents:
13158
diff
changeset
|
42 function s = strtrim (s) |
6975 | 43 |
44 if (nargin != 1) | |
45 print_usage (); | |
46 endif | |
47 | |
48 if (ischar (s)) | |
49 | |
12876
29cd5a828bb2
strtrim.m: Don't remove nuls (\0) from string.
Rik <octave@nomad.inbox5.com>
parents:
12874
diff
changeset
|
50 k = find (! isspace (s)); |
6975 | 51 if (isempty (s) || isempty (k)) |
52 s = ""; | |
53 else | |
12874
d5d3f04a645f
strtrim.m: Make behavior same for cell arrays as for char arrays.
Rik <octave@nomad.inbox5.com>
parents:
12867
diff
changeset
|
54 s = s(:, ceil (min (k) / rows (s)):ceil (max (k) / rows (s))); |
6975 | 55 endif |
56 | |
13158
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
57 elseif (iscell (s)) |
6975 | 58 |
13158
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
59 char_idx = cellfun ("isclass", s, "char"); |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
60 cell_idx = cellfun ("isclass", s, "cell"); |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
61 if (! all (char_idx | cell_idx)) |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
62 error ("strtrim: S argument must be a string or cellstring"); |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
63 endif |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
64 |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
65 ## Divide work load. Recursive cellfun strtrim call is slow |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
66 ## and avoided where possible. |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
67 s(char_idx) = regexprep (s(char_idx), "^[\\s\v]+|[\\s\v]+$", ''); |
a1049e4480f8
strtrim.m: Allow operation on nested cellstr arrays (Bug #34123).
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
68 s(cell_idx) = cellfun ("strtrim", s(cell_idx), "UniformOutput", false); |
6975 | 69 |
70 else | |
12925
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
12876
diff
changeset
|
71 error ("strtrim: S argument must be a string or cellstring"); |
6975 | 72 endif |
73 | |
74 endfunction | |
8442
502e58a0d44f
Fix docstrings, add examples, references and tests to string functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
7666
diff
changeset
|
75 |
12874
d5d3f04a645f
strtrim.m: Make behavior same for cell arrays as for char arrays.
Rik <octave@nomad.inbox5.com>
parents:
12867
diff
changeset
|
76 |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
77 %!assert (strtrim (" abc "), "abc") |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
78 %!assert (strtrim (" "), "") |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
79 %!assert (strtrim ("abc"), "abc") |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
80 %!assert (strtrim ([" abc "; " def "]), ["abc "; " def"]) |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
81 %!assert (strtrim ({" abc "; " def "}), {"abc"; "def"}) |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
82 %!assert (strtrim ({" abc ", {" def "}}), {"abc", {"def"}}) |
12874
d5d3f04a645f
strtrim.m: Make behavior same for cell arrays as for char arrays.
Rik <octave@nomad.inbox5.com>
parents:
12867
diff
changeset
|
83 |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
84 %!error <Invalid call to strtrim> strtrim () |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
85 %!error <Invalid call to strtrim> strtrim ("abc", "def") |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
86 %!error <argument must be a string> strtrim (1) |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
87 %!error <argument must be a string> strtrim ({[]}) |
12874
d5d3f04a645f
strtrim.m: Make behavior same for cell arrays as for char arrays.
Rik <octave@nomad.inbox5.com>
parents:
12867
diff
changeset
|
88 |