Skip to content

Commit ad20746

Browse files
authored
make completions const (#408)
* make some completion methods const
1 parent 3cc7ba7 commit ad20746

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

keyvi/.clang-tidy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ Checks: "*,
1111
-readability-else-after-return,
1212
-readability-static-accessed-through-instance,
1313
-readability-avoid-const-params-in-decls,
14+
-readability-magic-numbers,
1415
-cppcoreguidelines-non-private-member-variables-in-classes,
1516
-misc-non-private-member-variables-in-classes,
17+
-cppcoreguidelines-avoid-magic-numbers,
1618
"
1719
HeaderFilterRegex: ''
1820
FormatStyle: none

keyvi/CPPLINT.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
linelength=120
22
root=include
3-
filter=-build/include_subdir,-whitespace/indent_namespace,-build/c++17
3+
filter=-build/include_subdir,-whitespace/indent_namespace,-build/c++17,-readability/nolint

keyvi/include/keyvi/dictionary/completion/forward_backward_completion.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <boost/algorithm/string.hpp>
3636

3737
#include "keyvi/dictionary/completion/prefix_completion.h"
38+
#include "keyvi/dictionary/match_iterator.h"
3839
#include "keyvi/dictionary/util/bounded_priority_queue.h"
3940

4041
// #define ENABLE_TRACING
@@ -56,7 +57,9 @@ class ForwardBackwardCompletion final {
5657
bool operator()(const match_t& m1, const match_t& m2) const { return m1->GetScore() < m2->GetScore(); }
5758
};
5859

59-
MatchIterator::MatchIteratorPair GetCompletions(const std::string& query, int number_of_results = 10) {
60+
// NOLINTBEGIN(readability-function-cognitive-complexity)
61+
[[nodiscard]] MatchIterator::MatchIteratorPair GetCompletions(const std::string& query,
62+
int number_of_results = 10) const {
6063
// get query length
6164
const size_t query_length = query.size();
6265

@@ -252,9 +255,9 @@ class ForwardBackwardCompletion final {
252255

253256
return match_t();
254257
};
255-
256258
return MatchIterator::MakeIteratorPair(tfunc);
257259
}
260+
// NOLINTEND(readability-function-cognitive-complexity)
258261

259262
private:
260263
PrefixCompletion forward_completions_;

keyvi/include/keyvi/dictionary/completion/prefix_completion.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#define KEYVI_DICTIONARY_COMPLETION_PREFIX_COMPLETION_H_
2727

2828
#include <algorithm>
29+
#include <cstddef>
2930
#include <memory>
3031
#include <string>
3132
#include <utility>
@@ -54,7 +55,8 @@ class PrefixCompletion final {
5455
public:
5556
explicit PrefixCompletion(dictionary_t d) : fsa_(d->GetFsa()) {}
5657

57-
MatchIterator::MatchIteratorPair GetCompletions(const std::string& query, size_t number_of_results = 10) {
58+
[[nodiscard]] MatchIterator::MatchIteratorPair GetCompletions(const std::string& query,
59+
size_t number_of_results = 10) const {
5860
uint64_t state = fsa_->GetStartState();
5961
const size_t query_length = query.size();
6062
size_t depth = 0;

0 commit comments

Comments
 (0)