Mercurial > octave-nkf
changeset 5620:0225507842a1
[project @ 2006-02-13 20:24:42 by dbateman]
| author | dbateman |
|---|---|
| date | Mon, 13 Feb 2006 20:24:42 +0000 |
| parents | e9112ff172b1 |
| children | 7ef7b8388901 |
| files | src/DLD-FUNCTIONS/regexp.cc |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/regexp.cc Mon Feb 13 20:07:18 2006 +0000 +++ b/src/DLD-FUNCTIONS/regexp.cc Mon Feb 13 20:24:42 2006 +0000 @@ -631,7 +631,7 @@ %!test %! ## This test is expected to fail if PCRE is not installed -%! if (strfind(octave_config_info ("DEFS"),"HAVE_PCRE")) +%! if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_PCRE"))) %! [s, e, te, m, t, nm] = regexp('short test string','(?<word1>\w*t)\s*(?<word2>\w*t)'); %! assert (s,1) %! assert (e,10) @@ -650,7 +650,7 @@ %!test %! ## This test is expected to fail if PCRE is not installed -%! if (strfind(octave_config_info ("DEFS"),"HAVE_PCRE")) +%! if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_PCRE"))) %! [nm, m, te, e, s, t] = regexp('short test string','(?<word1>\w*t)\s*(?<word2>\w*t)', 'names', 'match', 'tokenExtents', 'end', 'start', 'tokens'); %! assert (s,1) %! assert (e,10) @@ -669,7 +669,7 @@ %!test %! ## This test is expected to fail if PCRE is not installed -%! if (strfind(octave_config_info ("DEFS"),"HAVE_PCRE")) +%! if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_PCRE"))) %! [t, nm] = regexp("John Davis\nRogers, James",'(?<first>\w+)\s+(?<last>\w+)|(?<last>\w+),\s+(?<first>\w+)','tokens','names'); %! assert (size(t), [1,2]); %! assert (t{1}{1},'John'); @@ -770,7 +770,7 @@ %!test %! ## This test is expected to fail if PCRE is not installed -%! if (strfind(octave_config_info ("DEFS"),"HAVE_PCRE")) +%! if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_PCRE"))) %! [s, e, te, m, t, nm] = regexpi('ShoRt Test String','(?<word1>\w*t)\s*(?<word2>\w*t)'); %! assert (s,1) %! assert (e,10) @@ -789,7 +789,7 @@ %!test %! ## This test is expected to fail if PCRE is not installed -%! if (strfind(octave_config_info ("DEFS"),"HAVE_PCRE")) +%! if (!isempty(findstr(octave_config_info ("DEFS"),"HAVE_PCRE"))) %! [nm, m, te, e, s, t] = regexpi('ShoRt Test String','(?<word1>\w*t)\s*(?<word2>\w*t)', 'names', 'match', 'tokenExtents', 'end', 'start', 'tokens'); %! assert (s,1) %! assert (e,10)