aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorStefan Monnier2022-09-28 19:05:16 -0400
committerStefan Monnier2022-09-28 19:05:16 -0400
commitea8daec9bb8ebf3cbca35edec4e4ef7b6edac3de (patch)
tree1a34f44adca5fbf08033829dab643db6340bf296 /src/buffer.c
parent800ecd4767df48beeefabccdacd089b8c4286529 (diff)
downloademacs-ea8daec9bb8ebf3cbca35edec4e4ef7b6edac3de.tar.gz
emacs-ea8daec9bb8ebf3cbca35edec4e4ef7b6edac3de.zip
itree.[ch]: Add sanity checks, comments, and minor tweaks
* src/alloc.c (mark_overlay): Add sanity check. * src/buffer.c (next_overlay_change, previous_overlay_change): Tweak code to keep the same vars for the bounds. * src/itree.c (interval_tree_clear, interval_tree_insert) (interval_tree_remove, interval_tree_insert_fix, interval_tree_remove_fix): Adjust to the `color` -> `red` change. (interval_tree_clear): Prefer `true/false` for booleans. (interval_generator_create): Use an actual `interval_tree_order` value rather than 0. (interval_generator_next): Simplify a tiny bit. Add comment. (interval_generator_narrow): Add sanity check. * src/itree.h (struct interval_node): Replace `color` field with boolean `red` field. (enum interval_tree_order): Remove unused `ITREE_DEFLT_ORDER` value. * src/pdumper.c (dump_interval_node): Adjust to the `color` -> `red` change.
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 2b1997fc8be..879e14be960 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2992,7 +2992,7 @@ next_overlay_change (ptrdiff_t pos)
2992 ptrdiff_t next = ZV; 2992 ptrdiff_t next = ZV;
2993 struct interval_node *node; 2993 struct interval_node *node;
2994 2994
2995 buffer_overlay_iter_start (current_buffer, pos, ZV, ITREE_ASCENDING); 2995 buffer_overlay_iter_start (current_buffer, pos, next, ITREE_ASCENDING);
2996 while ((node = buffer_overlay_iter_next (current_buffer))) 2996 while ((node = buffer_overlay_iter_next (current_buffer)))
2997 { 2997 {
2998 if (node->begin > pos) 2998 if (node->begin > pos)
@@ -3020,7 +3020,7 @@ previous_overlay_change (ptrdiff_t pos)
3020 struct interval_node *node; 3020 struct interval_node *node;
3021 ptrdiff_t prev = BEGV; 3021 ptrdiff_t prev = BEGV;
3022 3022
3023 buffer_overlay_iter_start (current_buffer, BEGV, pos, ITREE_DESCENDING); 3023 buffer_overlay_iter_start (current_buffer, prev, pos, ITREE_DESCENDING);
3024 while ((node = buffer_overlay_iter_next (current_buffer))) 3024 while ((node = buffer_overlay_iter_next (current_buffer)))
3025 { 3025 {
3026 if (node->end < pos) 3026 if (node->end < pos)