From 9bb3fbbbc6445b457f1dca8ae2e0ea2eb915753d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sat, 26 Sep 2020 14:50:28 +0200 Subject: text: introduce text_iterator_has_{next,prev} Abstract away access to `it->piece` inorder to enable different implementations/backends. --- text.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'text.c') diff --git a/text.c b/text.c index ee8be61..2ffb78a 100644 --- a/text.c +++ b/text.c @@ -1438,15 +1438,23 @@ bool text_iterator_valid(const Iterator *it) { return it->piece && it->piece->text; } +bool text_iterator_has_next(const Iterator *it) { + return it->piece && it->piece->next; +} + +bool text_iterator_has_prev(const Iterator *it) { + return it->piece && it->piece->prev; +} + bool text_iterator_byte_next(Iterator *it, char *b) { - if (!it->piece || !it->piece->next) + if (!text_iterator_has_next(it)) return false; bool eof = true; if (it->text < it->end) { it->text++; it->pos++; eof = false; - } else if (!it->piece->prev) { + } else if (!text_iterator_has_prev(it)) { eof = false; } @@ -1466,9 +1474,9 @@ bool text_iterator_byte_next(Iterator *it, char *b) { } bool text_iterator_byte_prev(Iterator *it, char *b) { - if (!it->piece || !it->piece->prev) + if (!text_iterator_has_prev(it)) return false; - bool eof = !it->piece->next; + bool eof = !text_iterator_has_next(it); while (it->text == it->start) { if (!text_iterator_prev(it)) { if (!eof) -- cgit v1.2.3