Mercurial > hg > octave-lyh
annotate scripts/strings/deblank.m @ 17535:c12c688a35ed default tip lyh
Fix warnings
author | LYH <lyh.kernel@gmail.com> |
---|---|
date | Fri, 27 Sep 2013 17:43:27 +0800 |
parents | f3d52523cde1 |
children |
rev | line source |
---|---|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13929
diff
changeset
|
1 ## Copyright (C) 1996-2012 Kurt Hornik |
2325 | 2 ## |
2313 | 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. | |
2313 | 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/>. | |
2268 | 18 |
3361 | 19 ## -*- texinfo -*- |
20 ## @deftypefn {Function File} {} deblank (@var{s}) | |
12925
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
11589
diff
changeset
|
21 ## Remove trailing whitespace and nulls from @var{s}. If @var{s} |
5462 | 22 ## is a matrix, @var{deblank} trims each row to the length of longest |
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 ## string. If @var{s} is a cell array of strings, operate recursively on each |
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 ## string element. |
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
|
25 ## |
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
|
26 ## Examples: |
13929
9cae456085c2
Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents:
13162
diff
changeset
|
27 ## |
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
|
28 ## @example |
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 ## @group |
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
|
30 ## deblank (" abc ") |
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
|
31 ## @result{} " abc" |
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 ## |
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
|
33 ## deblank ([" abc "; " def "]) |
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
|
34 ## @result{} [" abc " ; " def"] |
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 ## @end group |
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
|
36 ## @end example |
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
|
37 ## @seealso{strtrim} |
3361 | 38 ## @end deftypefn |
2311 | 39 |
5428 | 40 ## Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> |
2355 | 41 ## Adapted-By: jwe |
2314 | 42 |
5462 | 43 function s = deblank (s) |
2325 | 44 |
2268 | 45 if (nargin != 1) |
6046 | 46 print_usage (); |
2268 | 47 endif |
2325 | 48 |
12925
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
11589
diff
changeset
|
49 if (ischar (s)) |
2268 | 50 |
12925
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
11589
diff
changeset
|
51 k = find (! isspace (s) & s != "\0"); |
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
11589
diff
changeset
|
52 if (isempty (s) || isempty (k)) |
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
11589
diff
changeset
|
53 s = ""; |
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
11589
diff
changeset
|
54 else |
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
11589
diff
changeset
|
55 s = s(:,1:ceil (max (k) / rows (s))); |
2268 | 56 endif |
57 | |
13162
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
58 elseif (iscell (s)) |
5462 | 59 |
13162
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
60 char_idx = cellfun ("isclass", s, "char"); |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
61 cell_idx = cellfun ("isclass", s, "cell"); |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
62 if (! all (char_idx | cell_idx)) |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
63 error ("deblank: S argument must be a string or cellstring"); |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
64 endif |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
65 |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
66 ## Divide work load. Recursive cellfun deblank call is slow |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
67 ## and avoided where possible. |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
68 s(char_idx) = regexprep (s(char_idx), "[\\s\v\\0]+$", ''); |
4e92b71dcc97
deblank.m: Modified to accept nested cellstr arrays (Bug #34123)
Rik <octave@nomad.inbox5.com>
parents:
12981
diff
changeset
|
69 s(cell_idx) = cellfun ("deblank", s(cell_idx), "UniformOutput", false); |
5462 | 70 |
2268 | 71 else |
12925
1c71c9bf0570
deblank.m: Speed up 15x on cellstr inputs. Restrict input to strings or cellstrings.
Rik <octave@nomad.inbox5.com>
parents:
11589
diff
changeset
|
72 error ("deblank: S argument must be a string or cellstring"); |
2268 | 73 endif |
74 | |
75 endfunction | |
7411 | 76 |
7429 | 77 |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
78 %!assert (deblank (" f o o \0"), " f o o") |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
79 %!assert (deblank (' '), '') |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
80 %!assert (deblank (" "), "") |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
81 %!assert (deblank (""), "") |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
82 %!assert (deblank ({}), {}) |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
83 %!assert (deblank ({" abc ", {" def "}}), {" abc", {" def"}}) |
7429 | 84 |
14363
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 deblank> deblank () |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
86 %!error <Invalid call to deblank> deblank ("foo", "bar") |
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> deblank (1) |
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
88 %!error <argument must be a string> deblank ({[]}) |
7429 | 89 |