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

Faster BufferIterator::operator++/--

Browse Source
This commit is contained in:
Maxime Coste 2015-11-12 13:59:36 +00:00
parent 2113b829df
commit 67d1b7dcd1
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buffer.hh
View File

@ -58,7 +58,7 @@ private:
SafePtr<const Buffer> m_buffer; SafePtr<const Buffer> m_buffer;
ByteCoord m_coord; ByteCoord m_coord;
ByteCount m_line_length; ByteCount m_line_length;
LineCount m_line_count; LineCount m_last_line;
}; };
using BufferLines = Vector<StringDataPtr, MemoryDomain::BufferContent>; using BufferLines = Vector<StringDataPtr, MemoryDomain::BufferContent>;

17
src/buffer.inl.hh
View File

@ -108,7 +108,7 @@ inline ByteCoord Buffer::end_coord() const
inline BufferIterator::BufferIterator(const Buffer& buffer, ByteCoord coord) inline BufferIterator::BufferIterator(const Buffer& buffer, ByteCoord coord)
: m_buffer(&buffer), m_coord(coord), : m_buffer(&buffer), m_coord(coord),
m_line_length((*m_buffer)[m_coord.line].length()), m_line_length((*m_buffer)[m_coord.line].length()),
m_line_count(buffer.line_count()) m_last_line(buffer.line_count()-1)
{ {
kak_assert(m_buffer and m_buffer->is_valid(m_coord)); kak_assert(m_buffer and m_buffer->is_valid(m_coord));
} }
@ -193,11 +193,7 @@ inline BufferIterator& BufferIterator::operator-=(ByteCount size)
inline BufferIterator& BufferIterator::operator++() inline BufferIterator& BufferIterator::operator++()
{ {
if (m_coord.column < m_line_length - 1) if (++m_coord.column == m_line_length and m_coord.line != m_last_line)
++m_coord.column;
else if (m_coord.line == m_line_count - 1)
m_coord.column = m_line_length;
else
{ {
++m_coord.line; ++m_coord.line;
m_coord.column = 0; m_coord.column = 0;
@ -208,13 +204,10 @@ inline BufferIterator& BufferIterator::operator++()
inline BufferIterator& BufferIterator::operator--() inline BufferIterator& BufferIterator::operator--()
{ {
if (m_coord.column == 0) if (m_coord.column == 0 and m_coord.line > 0)
{ {
if (m_coord.line > 0) m_line_length = m_buffer->line_storage(--m_coord.line)->length;
{ m_coord.column = m_line_length - 1;
m_line_length = m_buffer->line_storage(--m_coord.line)->length;
m_coord.column = m_line_length - 1;
}
} }
else else
--m_coord.column; --m_coord.column;