diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2013-06-03 19:10:28 +0200 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2013-06-04 14:21:07 +0200 |
| commit | c4f9253634b6c5c479bf0b05d407ecf689dd7369 (patch) | |
| tree | b8c64d58bb3421d8d4cd8ea37cf5e5ec487e50ca /src/buffer.cc | |
| parent | 503f0cce253b55e55bd6fa60ca59c902a9f9b81d (diff) | |
Remove Buffer::iterator_at_line_{begin,end}, use iterator_at(line{,+1})
Diffstat (limited to 'src/buffer.cc')
| -rw-r--r-- | src/buffer.cc | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/buffer.cc b/src/buffer.cc index e0c4c3ff..8e63350b 100644 --- a/src/buffer.cc +++ b/src/buffer.cc @@ -108,30 +108,6 @@ BufferCoord Buffer::clamp(BufferCoord coord) const return coord; } -BufferIterator Buffer::iterator_at_line_begin(LineCount line) const -{ - line = Kakoune::clamp(line, 0_line, line_count()-1); - kak_assert(line_length(line) > 0); - return BufferIterator(*this, { line, 0 }); -} - -BufferIterator Buffer::iterator_at_line_begin(const BufferIterator& iterator) const -{ - return iterator_at_line_begin(iterator.line()); -} - -BufferIterator Buffer::iterator_at_line_end(LineCount line) const -{ - line = Kakoune::clamp(line, 0_line, line_count()-1); - kak_assert(line_length(line) > 0); - return ++BufferIterator(*this, { line, line_length(line) - 1 }); -} - -BufferIterator Buffer::iterator_at_line_end(const BufferIterator& iterator) const -{ - return iterator_at_line_end(iterator.line()); -} - BufferIterator Buffer::begin() const { return BufferIterator(*this, { 0_line, 0 }); @@ -729,8 +705,7 @@ bool Buffer::is_valid(const BufferCoord& c) const bool Buffer::is_end(const BufferCoord& c) const { - return (c.line == line_count() and c.column == 0) or - (c.line == line_count() - 1 and c.column == m_lines.back().length()); + return c >= BufferCoord{line_count() - 1, m_lines.back().length()}; } char Buffer::byte_at(const BufferCoord& c) const |
