Mercurial > hg > xemacs-beta
comparison src/extents.h @ 5168:cf900a2f1fa3
extract gap array from extents.c, use in range tables
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-22 Ben Wing <ben@xemacs.org>
* Makefile.in.in (objs):
* array.c:
* array.c (gap_array_adjust_markers):
* array.c (gap_array_move_gap):
* array.c (gap_array_make_gap):
* array.c (gap_array_insert_els):
* array.c (gap_array_delete_els):
* array.c (gap_array_make_marker):
* array.c (gap_array_delete_marker):
* array.c (gap_array_delete_all_markers):
* array.c (gap_array_clone):
* array.h:
* depend:
* emacs.c (main_1):
* extents.c:
* extents.c (EXTENT_GAP_ARRAY_AT):
* extents.c (extent_list_num_els):
* extents.c (extent_list_locate):
* extents.c (extent_list_at):
* extents.c (extent_list_delete_all):
* extents.c (allocate_extent_list):
* extents.c (syms_of_extents):
* extents.h:
* extents.h (XEXTENT_LIST_MARKER):
* lisp.h:
* rangetab.c:
* rangetab.c (mark_range_table):
* rangetab.c (print_range_table):
* rangetab.c (range_table_equal):
* rangetab.c (range_table_hash):
* rangetab.c (verify_range_table):
* rangetab.c (get_range_table_pos):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (put_range_table):
* rangetab.c (Fclear_range_table):
* rangetab.c (Fmap_range_table):
* rangetab.c (unified_range_table_bytes_needed):
* rangetab.c (unified_range_table_copy_data):
* rangetab.c (unified_range_table_lookup):
* rangetab.h:
* rangetab.h (struct range_table_entry):
* rangetab.h (struct Lisp_Range_Table):
* rangetab.h (rangetab_gap_array_at):
* symsinit.h:
Rename dynarr.c to array.c. Move gap array from extents.c to array.c.
Extract dynarr, gap array and stack-like malloc into new file array.h.
Rename GAP_ARRAY_NUM_ELS -> gap_array_length(). Add gap_array_at(),
gap_array_atp().
Rewrite range table code to use gap arrays. Make put_range_table()
smarter so that its operation is O(log n) for adding a localized
range.
* gc.c (lispdesc_block_size_1):
Don't ABORT() when two elements are located at the same place.
This will happen with a size-0 gap array -- both parts of the array
(before and after gap) are in the same place.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 22 Mar 2010 19:12:15 -0500 |
parents | 1fae11d56ad2 |
children | 5ddbab03b0e6 |
comparison
equal
deleted
inserted
replaced
5167:e374ea766cc1 | 5168:cf900a2f1fa3 |
---|---|
48 #define EXTENT_INFOP(x) RECORDP (x, extent_info) | 48 #define EXTENT_INFOP(x) RECORDP (x, extent_info) |
49 #define CHECK_EXTENT_INFO(x) CHECK_RECORD (x, extent_info) | 49 #define CHECK_EXTENT_INFO(x) CHECK_RECORD (x, extent_info) |
50 #define CONCHECK_EXTENT_INFO(x) CONCHECK_RECORD (x, extent_info) | 50 #define CONCHECK_EXTENT_INFO(x) CONCHECK_RECORD (x, extent_info) |
51 | 51 |
52 #ifdef NEW_GC | 52 #ifdef NEW_GC |
53 struct gap_array_marker; | |
54 | |
55 DECLARE_LISP_OBJECT (gap_array_marker, struct gap_array_marker); | |
56 #define XGAP_ARRAY_MARKER(x) \ | |
57 XRECORD (x, gap_array_marker, struct gap_array_marker) | |
58 #define wrap_gap_array_marker(p) wrap_record (p, gap_array_marker) | |
59 #define GAP_ARRAY_MARKERP(x) RECORDP (x, gap_array_marker) | |
60 #define CHECK_GAP_ARRAY_MARKER(x) CHECK_RECORD (x, gap_array_marker) | |
61 #define CONCHECK_GAP_ARRAY_MARKER(x) CONCHECK_RECORD (x, gap_array_marker) | |
62 | |
63 struct gap_array; | |
64 | |
65 DECLARE_LISP_OBJECT (gap_array, struct gap_array); | |
66 #define XGAP_ARRAY(x) XRECORD (x, gap_array, struct gap_array) | |
67 #define wrap_gap_array(p) wrap_record (p, gap_array) | |
68 #define GAP_ARRAYP(x) RECORDP (x, gap_array) | |
69 #define CHECK_GAP_ARRAY(x) CHECK_RECORD (x, gap_array) | |
70 #define CONCHECK_GAP_ARRAY(x) CONCHECK_RECORD (x, gap_array) | |
71 | |
72 struct extent_list_marker; | 53 struct extent_list_marker; |
73 | 54 |
74 DECLARE_LISP_OBJECT (extent_list_marker, struct extent_list_marker); | 55 DECLARE_LISP_OBJECT (extent_list_marker, struct extent_list_marker); |
75 #define XEXTENT_LIST_MARKER(x) \ | 56 #define XEXTENT_LIST_MARKER(x) \ |
76 XRECORD (x, extent_list_marker, struct extent_list_marker) | 57 XRECORD (x, extent_list_marker, struct extent_list_marker) |