vis

commit 789a4396aa4b247393b435be041a6be7ef0e09f3
parent d3007b1f1a92f19a40703b0bcc7a91dfc198d5aa
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Sat, 26 Sep 2020 14:50:28 +0200

text: introduce text_iterator_has_{next,prev}

Abstract away access to `it->piece` inorder to enable different
implementations/backends.

Diffstat:
M
text.c
 | 
16
++++++++++++----
M
text.h
 | 
2
++

2 files changed, 14 insertions(+), 4 deletions(-)
diff --git 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)
diff --git a/text.h b/text.h
@@ -251,6 +251,8 @@ char *text_bytes_alloc0(Text*, size_t pos, size_t len);
  */
 Iterator text_iterator_get(Text*, size_t pos);
 bool text_iterator_valid(const Iterator*);
+bool text_iterator_has_next(const Iterator*);
+bool text_iterator_has_prev(const Iterator*);
 bool text_iterator_next(Iterator*);
 bool text_iterator_prev(Iterator*);
 /**