diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2016-02-17 23:05:08 +0000 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2016-02-17 23:05:08 +0000 |
| commit | 85a8a0c26d68c1cba203810aaa5cd42e635112cb (patch) | |
| tree | a7f53ee8e1777e8ca8a6d969d4eebe4b4510cb4a | |
| parent | c9f01e216888b9ce11449a0b8b3020d2f1f9bb14 (diff) | |
Fix count_word_boundaries_match
| -rw-r--r-- | src/ranked_match.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/ranked_match.cc b/src/ranked_match.cc index a7fd4fb3..a36ccdcc 100644 --- a/src/ranked_match.cc +++ b/src/ranked_match.cc @@ -11,7 +11,7 @@ using Utf8It = utf8::iterator<const char*>; static int count_word_boundaries_match(StringView candidate, StringView query) { int count = 0; - Utf8It qit{query.begin(), query}; + Utf8It query_it{query.begin(), query}; Codepoint prev = 0; 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; const Codepoint lc = to_lower(c); - for (; qit != query.end(); ++qit) + for (auto qit = query_it; qit != query.end(); ++qit) { const Codepoint qc = *qit; if (qc == (islower(qc) ? lc : c)) { ++count; - ++qit; + query_it = qit+1; break; } } - if (qit == query.end()) + if (query_it == query.end()) break; } return count; @@ -112,6 +112,10 @@ bool RankedMatch::operator<(const RankedMatch& other) const UnitTest test_ranked_match{[] { 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); }}; } |