summaryrefslogtreecommitdiff
path: root/src/buffer.cc
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2013-03-13 14:25:22 +0100
committerMaxime Coste <frrrwww@gmail.com>2013-03-13 14:36:10 +0100
commitc1db67e31a18a723f455fa0b93c09f01100fcb59 (patch)
treec4df20f2ae2068c6c195e75bf219f3b32d2f9134 /src/buffer.cc
parent8acb25d9a49bf03a32673103da19b236229db23d (diff)
Buffer: minor refactoring
Diffstat (limited to 'src/buffer.cc')
-rw-r--r--src/buffer.cc16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/buffer.cc b/src/buffer.cc
index ac11553f..e86df929 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -86,11 +86,6 @@ BufferCoord Buffer::clamp(const BufferCoord& line_and_column,
return result;
}
-BufferIterator Buffer::iterator_at_line_begin(const BufferIterator& iterator) const
-{
- return BufferIterator(*this, { iterator.line(), 0 });
-}
-
BufferIterator Buffer::iterator_at_line_begin(LineCount line) const
{
line = Kakoune::clamp(line, 0_line, line_count()-1);
@@ -98,11 +93,9 @@ BufferIterator Buffer::iterator_at_line_begin(LineCount line) const
return BufferIterator(*this, { line, 0 });
}
-BufferIterator Buffer::iterator_at_line_end(const BufferIterator& iterator) const
+BufferIterator Buffer::iterator_at_line_begin(const BufferIterator& iterator) const
{
- LineCount line = iterator.line();
- assert(line_length(line) > 0);
- return ++BufferIterator(*this, { line, line_length(line) - 1 });
+ return iterator_at_line_begin(iterator.line());
}
BufferIterator Buffer::iterator_at_line_end(LineCount line) const
@@ -112,6 +105,11 @@ BufferIterator Buffer::iterator_at_line_end(LineCount line) const
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 });