xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61293e8d60
kakoune/src/buffer_iterator.inl.hh

203 lines
5.0 KiB
C++
Raw Normal View History

BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
#ifndef buffer_iterator_inl_h_INCLUDED
#define buffer_iterator_inl_h_INCLUDED
#include "assert.hh"
namespace Kakoune
{
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
inline BufferIterator::BufferIterator(const Buffer& buffer, BufferCoord coord)
: m_buffer(&buffer), m_coord(coord)
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
{
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
assert(is_valid());
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline const Buffer& BufferIterator::buffer() const
{
assert(m_buffer);
return *m_buffer;
}
DynamicBufferIterator: add and use in Selections DynamicBufferIterator are a new type of BufferIterators that automatically update themselves when their buffer is modified. Selections now uses this type of iterators instead of plain ones
2011-10-24 16:26:21 +02:00
inline bool BufferIterator::is_valid() const
{
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return m_buffer and
((line() < m_buffer->line_count() and
add a Line::length method
2012-03-30 14:00:40 +02:00
column() < m_buffer->m_lines[line()].length()) or
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
((line() == m_buffer->line_count() and column() == 0)) or
(line() == m_buffer->line_count() - 1 and
add a Line::length method
2012-03-30 14:00:40 +02:00
column() == m_buffer->m_lines.back().length()));
DynamicBufferIterator: add and use in Selections DynamicBufferIterator are a new type of BufferIterators that automatically update themselves when their buffer is modified. Selections now uses this type of iterators instead of plain ones
2011-10-24 16:26:21 +02:00
}
Add BufferIterator::clamp(bool avoid_eol) method
2012-08-15 18:18:12 +02:00
inline void BufferIterator::clamp(bool avoid_eol)
{
assert(m_buffer);
m_coord = m_buffer->clamp(m_coord, avoid_eol);
}
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
inline bool BufferIterator::operator==(const BufferIterator& iterator) const
{
assert(m_buffer == iterator.m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return (m_coord == iterator.m_coord);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline bool BufferIterator::operator!=(const BufferIterator& iterator) const
{
assert(m_buffer == iterator.m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return (m_coord != iterator.m_coord);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline bool BufferIterator::operator<(const BufferIterator& iterator) const
{
assert(m_buffer == iterator.m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return (m_coord < iterator.m_coord);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline bool BufferIterator::operator<=(const BufferIterator& iterator) const
{
assert(m_buffer == iterator.m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return (m_coord <= iterator.m_coord);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline bool BufferIterator::operator>(const BufferIterator& iterator) const
{
assert(m_buffer == iterator.m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return (m_coord > iterator.m_coord);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline bool BufferIterator::operator>=(const BufferIterator& iterator) const
{
assert(m_buffer == iterator.m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return (m_coord >= iterator.m_coord);
}
String and BufferIterator value_type goes back to plain char
2012-10-01 20:20:08 +02:00
inline char BufferIterator::operator*() const
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
{
perf tweak in BufferIterator
2012-12-13 14:34:33 +01:00
return m_buffer->m_lines[m_coord.line].content[m_coord.column];
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
}
use ByteCount instead of CharCount when we are really counting bytes (that is most of the time when we are not concerned with displaying)
2012-10-11 00:41:48 +02:00
inline ByteCount BufferIterator::offset() const
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
{
assert(m_buffer);
fix BufferIterator::offset
2013-03-29 19:28:57 +01:00
return line() >= m_buffer->line_count() ?
m_buffer->character_count() : m_buffer->m_lines[line()].start + column();
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
use a strongly typed int CharCount for character counts
2012-08-23 23:56:35 +02:00
inline size_t BufferIterator::operator-(const BufferIterator& iterator) const
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
{
assert(m_buffer == iterator.m_buffer);
use a strongly typed int CharCount for character counts
2012-08-23 23:56:35 +02:00
return (size_t)(int)(offset() - iterator.offset());
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
use ByteCount instead of CharCount when we are really counting bytes (that is most of the time when we are not concerned with displaying)
2012-10-11 00:41:48 +02:00
inline BufferIterator BufferIterator::operator+(ByteCount size) const
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
{
assert(m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
if (size >= 0)
{
use ByteCount instead of CharCount when we are really counting bytes (that is most of the time when we are not concerned with displaying)
2012-10-11 00:41:48 +02:00
ByteCount o = std::min(m_buffer->character_count(), offset() + size);
use a strongly typed int LineCount for line counts
2012-08-22 23:33:52 +02:00
for (LineCount i = line() + 1; i < m_buffer->line_count(); ++i)
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
{
if (m_buffer->m_lines[i].start > o)
return BufferIterator(*m_buffer, { i-1, o - m_buffer->m_lines[i-1].start });
}
use a strongly typed int LineCount for line counts
2012-08-22 23:33:52 +02:00
LineCount last_line = std::max(0_line, m_buffer->line_count() - 1);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return BufferIterator(*m_buffer, { last_line, o - m_buffer->m_lines[last_line].start });
}
return operator-(-size);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
use ByteCount instead of CharCount when we are really counting bytes (that is most of the time when we are not concerned with displaying)
2012-10-11 00:41:48 +02:00
inline BufferIterator BufferIterator::operator-(ByteCount size) const
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
{
assert(m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
if (size >= 0)
{
use ByteCount instead of CharCount when we are really counting bytes (that is most of the time when we are not concerned with displaying)
2012-10-11 00:41:48 +02:00
ByteCount o = std::max(0_byte, offset() - size);
use a strongly typed int LineCount for line counts
2012-08-22 23:33:52 +02:00
for (LineCount i = line(); i >= 0; --i)
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
{
if (m_buffer->m_lines[i].start <= o)
return BufferIterator(*m_buffer, { i, o - m_buffer->m_lines[i].start });
}
assert(false);
}
return operator+(-size);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
use ByteCount instead of CharCount when we are really counting bytes (that is most of the time when we are not concerned with displaying)
2012-10-11 00:41:48 +02:00
inline BufferIterator& BufferIterator::operator+=(ByteCount size)
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
{
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return *this = (*this + size);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
use ByteCount instead of CharCount when we are really counting bytes (that is most of the time when we are not concerned with displaying)
2012-10-11 00:41:48 +02:00
inline BufferIterator& BufferIterator::operator-=(ByteCount size)
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
{
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return *this = (*this - size);
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline BufferIterator& BufferIterator::operator++()
{
perf tweak in BufferIterator
2012-12-13 14:34:33 +01:00
if (m_coord.column < m_buffer->m_lines[m_coord.line].length() - 1)
specialize BufferIterator::operator++ to speed up Kakoune
2012-03-30 14:01:18 +02:00
++m_coord.column;
perf tweak in BufferIterator
2012-12-13 14:34:33 +01:00
else if (m_coord.line == m_buffer->m_lines.size() - 1)
specialize BufferIterator::operator++ to speed up Kakoune
2012-03-30 14:01:18 +02:00
m_coord.column = m_buffer->m_lines.back().length();
else
{
++m_coord.line;
m_coord.column = 0;
}
specialize BufferIterator::operator--
2012-03-31 17:21:14 +02:00
return *this;
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline BufferIterator& BufferIterator::operator--()
{
specialize BufferIterator::operator--
2012-03-31 17:21:14 +02:00
if (column() == 0)
{
if (line() > 0)
{
--m_coord.line;
m_coord.column = m_buffer->m_lines[m_coord.line].length() - 1;
}
}
else
--m_coord.column;
return *this;
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
add postfix operator++ to BufferIterator
2012-10-02 14:09:06 +02:00
inline BufferIterator BufferIterator::operator++(int)
{
BufferIterator save = *this;
++*this;
return save;
}
inline BufferIterator BufferIterator::operator--(int)
{
BufferIterator save = *this;
--*this;
return save;
}
move BufferIterator on_{insert,erase} as DynamicSelectionList implementation detail
2013-03-15 14:22:42 +01:00
inline BufferIterator& BufferIterator::operator=(const BufferCoord& coord)
{
m_coord = coord;
assert(is_valid());
return *this;
}
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
inline bool BufferIterator::is_begin() const
{
assert(m_buffer);
Store buffer content in a list of lines Instead of a big std::string, buffer now store it's content in a list of lines. In order to achieve O(log(n)) random access, lines contains both their content and their offset since the start of the file, making binary search usable. BufferIterator now have a LineAndColumn coordinate into the buffer instead of an offset so that access is still O(1).
2012-03-30 13:37:18 +02:00
return m_coord.line == 0 and m_coord.column == 0;
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
inline bool BufferIterator::is_end() const
{
assert(m_buffer);
Buffer: end is either one past last character, or one past last line
2013-01-23 18:52:42 +01:00
if (m_coord.line == m_buffer->line_count())
{
assert(m_coord.column == 0);
return true;
}
code cleanups in buffer
2012-06-25 19:05:32 +02:00
return offset() == m_buffer->character_count();
BufferIterator: move methods implementation to buffer_iterator.inl.h
2011-10-18 00:05:06 +02:00
}
}
#endif // buffer_iterator_inl_h_INCLUDED
Reference in New Issue Copy Permalink