Mercurial > hg > octave-nkf
changeset 20166:e78c0514523d
restore strmatch function; backout changeset f9959972949a
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 18 Mar 2015 10:20:26 -0400 |
parents | 55c2d33e6773 |
children | 656cb18bf858 |
files | doc/interpreter/container.txi libinterp/corefcn/strfind.cc scripts/strings/findstr.m |
diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/container.txi +++ b/doc/interpreter/container.txi @@ -891,8 +891,8 @@ Strings}), @code{strcmp}, @code{strncmp}, @code{strcmpi}, @code{strncmpi} (@pxref{Comparing Strings}), @code{str2double}, @code{deblank}, @code{strtrim}, @code{strtrunc}, @code{strfind}, -@code{regexp}, @code{regexpi} (@pxref{Manipulating Strings}) and -@code{str2double} (@pxref{String Conversions}). +@code{strmatch}, , @code{regexp}, @code{regexpi} (@pxref{Manipulating +Strings}) and @code{str2double} (@pxref{String Conversions}). The function @code{iscellstr} can be used to test if an object is a cell array of strings.
--- a/libinterp/corefcn/strfind.cc +++ b/libinterp/corefcn/strfind.cc @@ -188,7 +188,7 @@ @}\n\ @end group\n\ @end example\n\ -@seealso{findstr, regexp, regexpi, find}\n\ +@seealso{findstr, strmatch, regexp, regexpi, find}\n\ @end deftypefn") { octave_value retval;
--- a/scripts/strings/findstr.m +++ b/scripts/strings/findstr.m @@ -35,7 +35,7 @@ ## ## @strong{Caution:} @code{findstr} is scheduled for deprecation. Use ## @code{strfind} in all new code. -## @seealso{strfind, strcmp, strncmp, strcmpi, strncmpi, find} +## @seealso{strfind, strmatch, strcmp, strncmp, strcmpi, strncmpi, find} ## @end deftypefn ## Note that this implementation swaps the strings if second one is longer