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

use std::upper_bound in DisplayBuffer::atom_containing to run in O(log n)

Browse Source
This commit is contained in:
Maxime Coste 2012-04-05 02:00:34 +00:00
parent e4b872abd2
commit af5c528f04
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/display_buffer.cc
View File

@ -1,6 +1,7 @@
#include "display_buffer.hh" #include "display_buffer.hh"
#include "assert.hh" #include "assert.hh"
#include <algorithm>
namespace Kakoune namespace Kakoune
{ {
@ -92,12 +93,9 @@ DisplayBuffer::iterator DisplayBuffer::atom_containing(const BufferIterator& whe
DisplayBuffer::iterator DisplayBuffer::atom_containing(const BufferIterator& where, DisplayBuffer::iterator DisplayBuffer::atom_containing(const BufferIterator& where,
iterator start) iterator start)
{ {
for (iterator it = start; it != m_atoms.end(); ++it) return std::upper_bound(start, end(), where,
{ [](const BufferIterator& where, const DisplayAtom& atom)
if (it->end() > where) { return where < atom.end(); });
return it->begin() <= where ? it : end();
}
return end();
} }
DisplayBuffer::iterator DisplayBuffer::split(iterator atom, const BufferIterator& pos) DisplayBuffer::iterator DisplayBuffer::split(iterator atom, const BufferIterator& pos)