xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix count_word_boundaries_match

Browse Source
This commit is contained in:
Maxime Coste 2016-02-17 23:05:08 +00:00
parent c9f01e2168
commit 85a8a0c26d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ranked_match.cc
View File

@ -11,7 +11,7 @@ using Utf8It = utf8::iterator<const char*>;
static int count_word_boundaries_match(StringView candidate, StringView query) static int count_word_boundaries_match(StringView candidate, StringView query)
{ {
int count = 0; int count = 0;
Utf8It qit{query.begin(), query}; Utf8It query_it{query.begin(), query};
Codepoint prev = 0; Codepoint prev = 0;
for (Utf8It it{candidate.begin(), candidate}; it != candidate.end(); ++it) for (Utf8It it{candidate.begin(), candidate}; it != candidate.end(); ++it)
{ {
@ -25,17 +25,17 @@ static int count_word_boundaries_match(StringView candidate, StringView query)
continue; continue;
const Codepoint lc = to_lower(c); const Codepoint lc = to_lower(c);
for (; qit != query.end(); ++qit) for (auto qit = query_it; qit != query.end(); ++qit)
{ {
const Codepoint qc = *qit; const Codepoint qc = *qit;
if (qc == (islower(qc) ? lc : c)) if (qc == (islower(qc) ? lc : c))
{ {
++count; ++count;
++qit; query_it = qit+1;
break; break;
} }
} }
if (qit == query.end()) if (query_it == query.end())
break; break;
} }
return count; return count;
@ -112,6 +112,10 @@ bool RankedMatch::operator<(const RankedMatch& other) const
UnitTest test_ranked_match{[] { UnitTest test_ranked_match{[] {
kak_assert(count_word_boundaries_match("run_all_tests", "rat") == 3); kak_assert(count_word_boundaries_match("run_all_tests", "rat") == 3);
kak_assert(count_word_boundaries_match("run_all_tests", "at") == 2);
kak_assert(count_word_boundaries_match("countWordBoundariesMatch", "wm") == 2);
kak_assert(count_word_boundaries_match("countWordBoundariesMatch", "cobm") == 3);
kak_assert(count_word_boundaries_match("countWordBoundariesMatch", "cWBM") == 4);
}}; }};
} }