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

Make buffer iterator iteration/dereference faster

Browse Source
This commit is contained in:
Maxime Coste 2016-07-15 19:48:13 +01:00
parent b988871df6
commit 4ecdbea5c4
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/buffer.hh
View File

@ -84,8 +84,8 @@ public:
private: private:
SafePtr<const Buffer> m_buffer; SafePtr<const Buffer> m_buffer;
StringView m_line;
ByteCoord m_coord; ByteCoord m_coord;
ByteCount m_line_length;
LineCount m_last_line; LineCount m_last_line;
}; };

17
src/buffer.inl.hh
View File

@ -110,7 +110,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((*m_buffer)[coord.line]),
m_last_line(buffer.line_count()-1) 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));
@ -153,7 +153,7 @@ inline bool BufferIterator::operator>=(const BufferIterator& iterator) const
[[gnu::always_inline]] [[gnu::always_inline]]
inline const char& BufferIterator::operator*() const inline const char& BufferIterator::operator*() const
{ {
return m_buffer->byte_at(m_coord); return m_line[m_coord.column];
} }
inline const char& BufferIterator::operator[](size_t n) const inline const char& BufferIterator::operator[](size_t n) const
@ -181,24 +181,23 @@ inline BufferIterator BufferIterator::operator-(ByteCount size) const
inline BufferIterator& BufferIterator::operator+=(ByteCount size) inline BufferIterator& BufferIterator::operator+=(ByteCount size)
{ {
m_coord = m_buffer->advance(m_coord, size); m_coord = m_buffer->advance(m_coord, size);
m_line_length = m_buffer->line_storage(m_coord.line)->length; m_line = (*m_buffer)[m_coord.line];
return *this; return *this;
} }
inline BufferIterator& BufferIterator::operator-=(ByteCount size) inline BufferIterator& BufferIterator::operator-=(ByteCount size)
{ {
m_coord = m_buffer->advance(m_coord, -size); m_coord = m_buffer->advance(m_coord, -size);
m_line_length = m_buffer->line_storage(m_coord.line)->length; m_line = (*m_buffer)[m_coord.line];
return *this; return *this;
} }
inline BufferIterator& BufferIterator::operator++() inline BufferIterator& BufferIterator::operator++()
{ {
if (++m_coord.column == m_line_length and m_coord.line != m_last_line) if (++m_coord.column == m_line.length() and m_coord.line != m_last_line)
{ {
++m_coord.line; m_line = (*m_buffer)[++m_coord.line];
m_coord.column = 0; m_coord.column = 0;
m_line_length = m_buffer->line_storage(m_coord.line)->length;
} }
return *this; return *this;
} }
@ -207,8 +206,8 @@ inline BufferIterator& BufferIterator::operator--()
{ {
if (m_coord.column == 0 and m_coord.line > 0) if (m_coord.column == 0 and m_coord.line > 0)
{ {
m_line_length = m_buffer->line_storage(--m_coord.line)->length; m_line = (*m_buffer)[--m_coord.line];
m_coord.column = m_line_length - 1; m_coord.column = m_line.length() - 1;
} }
else else
--m_coord.column; --m_coord.column;