itree.c: Improve division between tree and iterator

* src/buffer.c (delete_all_overlays): Add comment.

* src/itree.c (struct interval_generator): New fields `running`,
`file`, and `line` moved from `interval_tree`.
(interval_stack_push_flagged): Adjust comment to resolve a FIXME.
(interval_tree_clear): Replace assignment with an a
(interval_tree_iter_next): Delete function.
(interval_tree_clear): Don't set `iter_running` here any more.
(interval_generator_create): Set it here instead.
(interval_tree_iter_start): Fetch `iter` once and for all.
(interval_generator_narrow): Mark it as non-static.
(interval_tree_iter_next, interval_tree_iter_narrow):
Delete functions.  Inline their old bodies in the callers.
(interval_tree_iter_finish): Take the iter rather than
the whole tree.  Adjust all callers.
(interval_generator_next): Move `running `assertion here from
`interval_tree_iter_next`.

* src/buffer.h: Adjust accordingly.

* src/itree.h (struct interval_tree): Remove fields `iter_running`,
`file`, and `line`, moved to `interval_generator`.
(interval_generator_narrow): Replace `interval_tree_iter_narrow`.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/buffer.h b/src/buffer.h
index 447be06594c..ad3b2ad6df5 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1458,21 +1458,21 @@ buffer_overlay_iter_next (struct buffer *b)
 {
   if (! b->overlays)
     return NULL;
-  return interval_tree_iter_next (b->overlays);
+  return interval_generator_next (b->overlays->iter);
 }
 
 INLINE void
 buffer_overlay_iter_finish (struct buffer *b)
 {
   if (b->overlays)
-    interval_tree_iter_finish (b->overlays);
+    interval_tree_iter_finish (b->overlays->iter);
 }
 
 INLINE void
 buffer_overlay_iter_narrow (struct buffer *b, ptrdiff_t begin, ptrdiff_t end)
 {
   if (b->overlays)
-    interval_tree_iter_narrow (b->overlays, begin, end);
+    interval_generator_narrow (b->overlays->iter, begin, end);
 }
 
 /* Return the start of OV in its buffer, or -1 if OV is not associated