summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorBasil L. Contovounesios <contovob@tcd.ie>2022-11-02 03:50:38 +0200
committerBasil L. Contovounesios <contovob@tcd.ie>2022-11-03 16:49:05 +0200
commita66280162f907a09be23922cc80ac352392adac6 (patch)
tree849424a1c4025c04d16602f65410a23ae26c7d00 /src/emacs.c
parent8b8038494ce8354a3e2cfffebba40dbd1328ebb9 (diff)
downloademacs-a66280162f907a09be23922cc80ac352392adac6.tar.gz
Port interval trees to --enable-checking=structs
Some names under the interval_* namespace were renamed under the itree_* namespace in commits: 0. f421b58db5 of 2022-10-19 "Prefix all itree.h type names with itree_". 1. 37a1145410 of 2022-10-19 "Rename all exported itree.h functions with the itree_ prefix" Further, some values still referenced in commentary were removed in commits: 2. 258e618364 of 2022-10-17 "Delete the itree_null sentinel node, use NULL everywhere." 3. 2c4a3910b3 of 2022-10-02 "itree: Use a single iterator object" * src/emacs.c (main): Allocate global itree iterator once and for all. * src/alloc.c (mark_overlay): * src/buffer.c (set_overlays_multibyte): * src/itree.c (itree_destroy): Update commentary. (interval_stack_ensure_space, itree_insert_gap): Prefer unsigned-to-unsigned comparisons over signed-to-unsigned. (interval_stack_push_flagged, interval_tree_insert) (interval_tree_contains, itree_iterator_start) (itree_iterator_finish, itree_iterator_next, itree_iterator_narrow): Improve assertions. (itree_init): Rename... (init_itree): ...to this, for consistency with other global init functions. (itree_create): Stop leaking a global iterator allocation on each call. (interval_tree_init): Complete renames of interval_tree -> itree_tree and interval_tree_clear -> itree_clear. (interval_tree_remove_fix): Fix indentation. * src/itree.h: Declare init_itree. (ITREE_FOREACH): Fix typo in commentary. * src/pdumper.c [CHECK_STRUCTS] (dump_interval_node): Use the correct name in the HASH condition and #error message. (dump_overlay, dump_buffer): Update HASH (bug#58975).
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 8ad70fecd41..40ba0db340d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -82,6 +82,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#endif /* HAVE_WINDOW_SYSTEM */
#include "bignum.h"
+#include "itree.h"
#include "intervals.h"
#include "character.h"
#include "buffer.h"
@@ -1931,6 +1932,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
running_asynch_code = 0;
init_random ();
init_xfaces ();
+ init_itree ();
#if defined HAVE_JSON && !defined WINDOWSNT
init_json ();