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

Fix buffer iterator_at_line_{begin,end}(LineCount)

Browse Source
This commit is contained in:
Maxime Coste 2012-10-31 14:28:03 +01:00
parent 74731b0d0f
commit c947819154
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/buffer.cc
View File

@ -87,7 +87,9 @@ BufferIterator Buffer::iterator_at_line_begin(const BufferIterator& iterator) co
BufferIterator Buffer::iterator_at_line_begin(LineCount line) const BufferIterator Buffer::iterator_at_line_begin(LineCount line) const
{ {
return BufferIterator(*this, clamp({ line, 0 })); line = Kakoune::clamp(line, 0_line, line_count()-1);
assert(line_length(line) > 0);
return BufferIterator(*this, { line, 0 });
} }
BufferIterator Buffer::iterator_at_line_end(const BufferIterator& iterator) const BufferIterator Buffer::iterator_at_line_end(const BufferIterator& iterator) const
@ -99,7 +101,7 @@ BufferIterator Buffer::iterator_at_line_end(const BufferIterator& iterator) cons
BufferIterator Buffer::iterator_at_line_end(LineCount line) const BufferIterator Buffer::iterator_at_line_end(LineCount line) const
{ {
line = std::min(line, line_count()-1); line = Kakoune::clamp(line, 0_line, line_count()-1);
assert(line_length(line) > 0); assert(line_length(line) > 0);
return ++BufferIterator(*this, { line, line_length(line) - 1 }); return ++BufferIterator(*this, { line, line_length(line) - 1 });
} }