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

Buffer: minor refactoring

Browse Source
This commit is contained in:
Maxime Coste 2013-03-13 14:25:22 +01:00
parent 8acb25d9a4
commit c1db67e31a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/buffer.cc
View File

@ -86,11 +86,6 @@ BufferCoord Buffer::clamp(const BufferCoord& line_and_column,
return result; 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 BufferIterator Buffer::iterator_at_line_begin(LineCount line) const
{ {
line = Kakoune::clamp(line, 0_line, line_count()-1); 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 }); 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(); return iterator_at_line_begin(iterator.line());
assert(line_length(line) > 0);
return ++BufferIterator(*this, { line, line_length(line) - 1 });
} }
BufferIterator Buffer::iterator_at_line_end(LineCount line) const 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 }); 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 BufferIterator Buffer::begin() const
{ {
return BufferIterator(*this, { 0_line, 0 }); return BufferIterator(*this, { 0_line, 0 });