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

Tweak WordDB implementation

Browse Source
This commit is contained in:
Maxime Coste 2015-03-10 13:50:25 +00:00
parent ea526c2137
commit a0cf75ec39
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/word_db.cc
View File

@ -52,9 +52,9 @@ static WordDB::WordList get_words(const SharedString& content)
return res; return res;
} }
void WordDB::add_words(const WordList& words) void WordDB::add_words(const SharedString& line)
{ {
for (auto& w : words) for (auto& w : get_words(line))
{ {
WordDB::WordInfo& info = m_words[intern(w)]; WordDB::WordInfo& info = m_words[intern(w)];
++info.refcount; ++info.refcount;
@ -63,9 +63,9 @@ void WordDB::add_words(const WordList& words)
} }
} }
void WordDB::remove_words(const WordList& words) void WordDB::remove_words(const SharedString& line)
{ {
for (auto& w : words) for (auto& w : get_words(line))
{ {
auto it = m_words.find({w, SharedString::NoCopy()}); auto it = m_words.find({w, SharedString::NoCopy()});
kak_assert(it != m_words.end() and it->second.refcount > 0); kak_assert(it != m_words.end() and it->second.refcount > 0);
@ -81,7 +81,7 @@ WordDB::WordDB(const Buffer& buffer)
for (auto line = 0_line, end = buffer.line_count(); line < end; ++line) for (auto line = 0_line, end = buffer.line_count(); line < end; ++line)
{ {
m_lines.push_back(buffer.line_storage(line)); m_lines.push_back(buffer.line_storage(line));
add_words(get_words(SharedString{m_lines.back()})); add_words(SharedString{m_lines.back()});
} }
} }
@ -112,13 +112,13 @@ void WordDB::update_db()
while (old_line < modif.old_line + modif.num_removed) while (old_line < modif.old_line + modif.num_removed)
{ {
kak_assert(old_line < m_lines.size()); kak_assert(old_line < m_lines.size());
remove_words(get_words(SharedString{m_lines[(int)old_line++]})); remove_words(SharedString{m_lines[(int)old_line++]});
} }
for (auto l = 0_line; l < modif.num_added; ++l) for (auto l = 0_line; l < modif.num_added; ++l)
{ {
new_lines.push_back(buffer.line_storage(modif.new_line + l)); new_lines.push_back(buffer.line_storage(modif.new_line + l));
add_words(get_words(SharedString{new_lines.back()})); add_words(SharedString{new_lines.back()});
} }
} }
while (old_line != (int)m_lines.size()) while (old_line != (int)m_lines.size())

4
src/word_db.hh
View File

@ -41,8 +41,8 @@ public:
int get_word_occurences(StringView word) const; int get_word_occurences(StringView word) const;
private: private:
void update_db(); void update_db();
void add_words(const WordList& words); void add_words(const SharedString& line);
void remove_words(const WordList& words); void remove_words(const SharedString& line);
struct WordInfo struct WordInfo
{ {