Mercurial > hg > xemacs-beta
annotate src/rangetab.c @ 5169:6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-24 Ben Wing <ben@xemacs.org>
* array.h:
* array.h (XD_LISP_DYNARR_DESC):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_reloc_one_mc):
* elhash.c:
* gc.c (lispdesc_one_description_line_size):
* gc.c (kkcc_marking):
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* lrecord.h (enum memory_description_type):
* lrecord.h (enum data_description_entry_flags):
* lrecord.h (struct opaque_convert_functions):
Rename XD_LISP_OBJECT_BLOCK_PTR to XD_INLINE_LISP_OBJECT_BLOCK_PTR
and document it in lrecord.h.
* data.c:
* data.c (finish_marking_weak_lists):
* data.c (continue_marking_ephemerons):
* data.c (finish_marking_ephemerons):
* elhash.c (MARK_OBJ):
* gc.c:
* gc.c (lispdesc_indirect_count_1):
* gc.c (struct):
* gc.c (kkcc_bt_push):
* gc.c (kkcc_gc_stack_push):
* gc.c (kkcc_gc_stack_push_lisp_object):
* gc.c (kkcc_gc_stack_repush_dirty_object):
* gc.c (KKCC_DO_CHECK_FREE):
* gc.c (mark_object_maybe_checking_free):
* gc.c (mark_struct_contents):
* gc.c (mark_lisp_object_block_contents):
* gc.c (register_for_finalization):
* gc.c (mark_object):
* gc.h:
* lisp.h:
* profile.c:
* profile.c (mark_profiling_info_maphash):
Clean up KKCC code related to DEBUG_XEMACS. Rename
kkcc_backtrace() to kkcc_backtrace_1() and add two params: a
`size' arg to control how many stack elements to print and a
`detailed' arg to control whether Lisp objects are printed using
`debug_print()'. Create front-ends to kkcc_backtrace_1() --
kkcc_detailed_backtrace(), kkcc_short_backtrace(),
kkcc_detailed_backtrace_full(), kkcc_short_backtrace_full(), as
well as shortened versions kbt(), kbts(), kbtf(), kbtsf() -- to
call it with various parameter values. Add an `is_lisp' field to
the stack and backtrace structures and use it to keep track of
whether an object pushed onto the stack is a Lisp object or a
non-Lisp structure; in kkcc_backtrace_1(), don't try to print a
non-Lisp structure as a Lisp object.
* elhash.c:
* extents.c:
* file-coding.c:
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* marker.c:
* marker.c (Fmarker_buffer):
* mule-coding.c:
* number.c:
* rangetab.c:
* specifier.c:
New macros IF_OLD_GC(), IF_NEW_GC() to simplify declaration of
Lisp objects when a finalizer may exist in one but not the other.
Use them appropriately.
* extents.c (finalize_extent_info):
Don't zero out data->soe and data->extents before trying to free,
else we get memory leaks.
* lrecord.h (enum lrecord_type):
Make the first lrecord type have value 1 not 0 so that 0 remains
without implementation and attempts to interpret zeroed memory
as a Lisp object will be more obvious.
* array.c (Dynarr_free):
* device-msw.c (msprinter_delete_device):
* device-tty.c (free_tty_device_struct):
* device-tty.c (tty_delete_device):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-x.c:
* emacs.c (free_argc_argv):
* emodules.c (attempt_module_delete):
* file-coding.c (chain_finalize_coding_stream_1):
* file-coding.c (chain_finalize_coding_stream):
* glyphs-eimage.c:
* glyphs-eimage.c (jpeg_instantiate_unwind):
* glyphs-eimage.c (gif_instantiate_unwind):
* glyphs-eimage.c (png_instantiate_unwind):
* glyphs-eimage.c (tiff_instantiate_unwind):
* imgproc.c:
* imgproc.c (build_EImage_quantable):
* insdel.c (uninit_buffer_text):
* mule-coding.c (iso2022_finalize_detection_state):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (tty_font_list):
* process.c:
* process.c (finalize_process):
* redisplay.c (add_propagation_runes):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_free_scrollbar_instance):
* scrollbar-gtk.c (gtk_release_scrollbar_instance):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (unshow_that_mofo):
* scrollbar-x.c (x_free_scrollbar_instance):
* scrollbar-x.c (x_release_scrollbar_instance):
* select-x.c:
* select-x.c (x_handle_selection_request):
* syntax.c:
* syntax.c (uninit_buffer_syntax_cache):
* text.h (eifree):
If possible, whenever we call xfree() on a field in a structure,
set the field to 0 afterwards. A lot of code is written so that
it checks the value being freed to see if it is non-zero before
freeing it -- doing this and setting the value to 0 afterwards
ensures (a) we won't try to free twice if the cleanup code is
called twice; (b) if the object itself stays around, KKCC won't
crash when attempting to mark the freed field.
* rangetab.c:
Add a finalization method when not NEW_GC to avoid memory leaks.
(#### We still get memory leaks when NEW_GC; need to convert gap
array to Lisp object).
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Mar 2010 01:22:51 -0500 |
| parents | cf900a2f1fa3 |
| children | 71ee43b8a74d |
| rev | line source |
|---|---|
| 428 | 1 /* XEmacs routines to deal with range tables. |
| 2 Copyright (C) 1995 Sun Microsystems, Inc. | |
|
4831
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
3 Copyright (C) 1995, 2002, 2004, 2005, 2010 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Written by Ben Wing, August 1995. */ | |
| 25 | |
| 26 #include <config.h> | |
| 27 #include "lisp.h" | |
| 28 #include "rangetab.h" | |
| 29 | |
| 30 Lisp_Object Qrange_tablep; | |
| 31 Lisp_Object Qrange_table; | |
| 32 | |
| 2421 | 33 Lisp_Object Qstart_closed_end_open; |
| 34 Lisp_Object Qstart_open_end_open; | |
| 35 Lisp_Object Qstart_closed_end_closed; | |
| 36 Lisp_Object Qstart_open_end_closed; | |
| 37 | |
| 428 | 38 |
| 39 /************************************************************************/ | |
| 40 /* Range table object */ | |
| 41 /************************************************************************/ | |
| 42 | |
| 2421 | 43 static enum range_table_type |
| 44 range_table_symbol_to_type (Lisp_Object symbol) | |
| 45 { | |
| 46 if (NILP (symbol)) | |
| 47 return RANGE_START_CLOSED_END_OPEN; | |
| 48 | |
| 49 CHECK_SYMBOL (symbol); | |
| 50 if (EQ (symbol, Qstart_closed_end_open)) | |
| 51 return RANGE_START_CLOSED_END_OPEN; | |
| 52 if (EQ (symbol, Qstart_closed_end_closed)) | |
| 53 return RANGE_START_CLOSED_END_CLOSED; | |
| 54 if (EQ (symbol, Qstart_open_end_open)) | |
| 55 return RANGE_START_OPEN_END_OPEN; | |
| 56 if (EQ (symbol, Qstart_open_end_closed)) | |
| 57 return RANGE_START_OPEN_END_CLOSED; | |
| 58 | |
| 59 invalid_constant ("Unknown range table type", symbol); | |
| 60 RETURN_NOT_REACHED (RANGE_START_CLOSED_END_OPEN); | |
| 61 } | |
| 62 | |
| 63 static Lisp_Object | |
| 64 range_table_type_to_symbol (enum range_table_type type) | |
| 65 { | |
| 66 switch (type) | |
| 67 { | |
| 68 case RANGE_START_CLOSED_END_OPEN: | |
| 69 return Qstart_closed_end_open; | |
| 70 case RANGE_START_CLOSED_END_CLOSED: | |
| 71 return Qstart_closed_end_closed; | |
| 72 case RANGE_START_OPEN_END_OPEN: | |
| 73 return Qstart_open_end_open; | |
| 74 case RANGE_START_OPEN_END_CLOSED: | |
| 75 return Qstart_open_end_closed; | |
| 76 } | |
| 77 | |
| 2500 | 78 ABORT (); |
| 2421 | 79 return Qnil; |
| 80 } | |
| 81 | |
| 428 | 82 /* We use a sorted array of ranges. |
| 83 | |
| 84 #### We should be using the gap array stuff from extents.c. This | |
| 85 is not hard but just requires moving that stuff out of that file. */ | |
| 86 | |
| 87 static Lisp_Object | |
| 88 mark_range_table (Lisp_Object obj) | |
| 89 { | |
| 440 | 90 Lisp_Range_Table *rt = XRANGE_TABLE (obj); |
| 428 | 91 int i; |
| 92 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
93 for (i = 0; i < gap_array_length (rt->entries); i++) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
94 mark_object (rangetab_gap_array_at (rt->entries, i).val); |
|
4690
257b468bf2ca
Move the #'query-coding-region implementation to C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4391
diff
changeset
|
95 |
| 428 | 96 return Qnil; |
| 97 } | |
| 98 | |
| 99 static void | |
| 2286 | 100 print_range_table (Lisp_Object obj, Lisp_Object printcharfun, |
| 101 int UNUSED (escapeflag)) | |
| 428 | 102 { |
| 440 | 103 Lisp_Range_Table *rt = XRANGE_TABLE (obj); |
| 428 | 104 int i; |
| 105 | |
| 2421 | 106 if (print_readably) |
| 107 write_fmt_string_lisp (printcharfun, "#s(range-table type %s data (", | |
| 108 1, range_table_type_to_symbol (rt->type)); | |
| 109 else | |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4831
diff
changeset
|
110 write_ascstring (printcharfun, "#<range-table "); |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
111 for (i = 0; i < gap_array_length (rt->entries); i++) |
| 428 | 112 { |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
113 struct range_table_entry rte = rangetab_gap_array_at (rt->entries, i); |
| 2421 | 114 int so, ec; |
| 428 | 115 if (i > 0) |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4831
diff
changeset
|
116 write_ascstring (printcharfun, " "); |
| 2421 | 117 switch (rt->type) |
| 118 { | |
| 119 case RANGE_START_CLOSED_END_OPEN: so = 0, ec = 0; break; | |
| 120 case RANGE_START_CLOSED_END_CLOSED: so = 0, ec = 1; break; | |
| 121 case RANGE_START_OPEN_END_OPEN: so = 1, ec = 0; break; | |
| 122 case RANGE_START_OPEN_END_CLOSED: so = 1; ec = 1; break; | |
| 2500 | 123 default: ABORT (); so = 0, ec = 0; break; |
| 2421 | 124 } |
| 125 write_fmt_string (printcharfun, "%c%ld %ld%c ", | |
| 126 print_readably ? '(' : so ? '(' : '[', | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
127 (long) (rte.first - so), |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
128 (long) (rte.last - ec), |
| 2421 | 129 print_readably ? ')' : ec ? ']' : ')' |
| 130 ); | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
131 print_internal (rte.val, printcharfun, 1); |
| 428 | 132 } |
| 2421 | 133 if (print_readably) |
|
4952
19a72041c5ed
Mule-izing, various fixes related to char * arguments
Ben Wing <ben@xemacs.org>
parents:
4831
diff
changeset
|
134 write_ascstring (printcharfun, "))"); |
| 2421 | 135 else |
|
5146
88bd4f3ef8e4
make lrecord UID's have a separate UID space for each object, resurrect debug SOE code in extents.c
Ben Wing <ben@xemacs.org>
parents:
5142
diff
changeset
|
136 write_fmt_string (printcharfun, " 0x%x>", LISP_OBJECT_UID (obj)); |
| 428 | 137 } |
| 138 | |
| 139 static int | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4831
diff
changeset
|
140 range_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) |
| 428 | 141 { |
| 440 | 142 Lisp_Range_Table *rt1 = XRANGE_TABLE (obj1); |
| 143 Lisp_Range_Table *rt2 = XRANGE_TABLE (obj2); | |
| 428 | 144 int i; |
| 145 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
146 if (gap_array_length (rt1->entries) != gap_array_length (rt2->entries)) |
| 428 | 147 return 0; |
| 148 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
149 for (i = 0; i < gap_array_length (rt1->entries); i++) |
| 428 | 150 { |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
151 struct range_table_entry *rte1 = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
152 rangetab_gap_array_atp (rt1->entries, i); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
153 struct range_table_entry *rte2 = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
154 rangetab_gap_array_atp (rt2->entries, i); |
| 428 | 155 |
| 156 if (rte1->first != rte2->first | |
| 157 || rte1->last != rte2->last | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4831
diff
changeset
|
158 || !internal_equal_0 (rte1->val, rte2->val, depth + 1, foldcase)) |
| 428 | 159 return 0; |
| 160 } | |
| 161 | |
| 162 return 1; | |
| 163 } | |
| 164 | |
| 2515 | 165 static Hashcode |
| 428 | 166 range_table_entry_hash (struct range_table_entry *rte, int depth) |
| 167 { | |
| 168 return HASH3 (rte->first, rte->last, internal_hash (rte->val, depth + 1)); | |
| 169 } | |
| 170 | |
| 2515 | 171 static Hashcode |
| 428 | 172 range_table_hash (Lisp_Object obj, int depth) |
| 173 { | |
| 440 | 174 Lisp_Range_Table *rt = XRANGE_TABLE (obj); |
| 428 | 175 int i; |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
176 int size = gap_array_length (rt->entries); |
| 2515 | 177 Hashcode hash = size; |
| 428 | 178 |
| 179 /* approach based on internal_array_hash(). */ | |
| 180 if (size <= 5) | |
| 181 { | |
| 182 for (i = 0; i < size; i++) | |
| 183 hash = HASH2 (hash, | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
184 range_table_entry_hash |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
185 (rangetab_gap_array_atp (rt->entries, i), depth)); |
| 428 | 186 return hash; |
| 187 } | |
| 188 | |
| 189 /* just pick five elements scattered throughout the array. | |
| 190 A slightly better approach would be to offset by some | |
| 191 noise factor from the points chosen below. */ | |
| 192 for (i = 0; i < 5; i++) | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
193 hash = HASH2 (hash, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
194 range_table_entry_hash |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
195 (rangetab_gap_array_atp (rt->entries, i*size/5), depth)); |
| 428 | 196 return hash; |
| 197 } | |
| 198 | |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
199 #ifndef NEW_GC |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
200 |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
201 /* #### This leaks memory under NEW_GC. To fix this, convert to Lisp object |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
202 gap array. */ |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
203 |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
204 static void |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
205 finalize_range_table (Lisp_Object obj) |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
206 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
207 Lisp_Range_Table *rt = XRANGE_TABLE (obj); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
208 if (rt->entries) |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
209 { |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
210 if (!DUMPEDP (rt->entries)) |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
211 free_gap_array (rt->entries); |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
212 rt->entries = 0; |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
213 } |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
214 } |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
215 |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
216 #endif /* not NEW_GC */ |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
217 |
| 1204 | 218 static const struct memory_description rte_description_1[] = { |
| 440 | 219 { XD_LISP_OBJECT, offsetof (range_table_entry, val) }, |
| 428 | 220 { XD_END } |
| 221 }; | |
| 222 | |
| 1204 | 223 static const struct sized_memory_description rte_description = { |
| 440 | 224 sizeof (range_table_entry), |
| 428 | 225 rte_description_1 |
| 226 }; | |
| 227 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
228 static const struct memory_description rtega_description_1[] = { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
229 XD_GAP_ARRAY_DESC (&rte_description), |
| 428 | 230 { XD_END } |
| 231 }; | |
| 232 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
233 static const struct sized_memory_description rtega_description = { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
234 0, rtega_description_1 |
| 428 | 235 }; |
| 236 | |
| 1204 | 237 static const struct memory_description range_table_description[] = { |
| 2551 | 238 { XD_BLOCK_PTR, offsetof (Lisp_Range_Table, entries), 1, |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
239 { &rtega_description } }, |
| 428 | 240 { XD_END } |
| 241 }; | |
| 242 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
243 DEFINE_DUMPABLE_LISP_OBJECT ("range-table", range_table, |
|
5169
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
244 mark_range_table, print_range_table, |
|
6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
Ben Wing <ben@xemacs.org>
parents:
5168
diff
changeset
|
245 IF_OLD_GC (finalize_range_table), |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
246 range_table_equal, range_table_hash, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
247 range_table_description, |
|
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
diff
changeset
|
248 Lisp_Range_Table); |
| 428 | 249 |
| 250 /************************************************************************/ | |
| 251 /* Range table operations */ | |
| 252 /************************************************************************/ | |
| 253 | |
| 800 | 254 #ifdef ERROR_CHECK_STRUCTURES |
| 428 | 255 |
| 256 static void | |
| 440 | 257 verify_range_table (Lisp_Range_Table *rt) |
| 428 | 258 { |
| 259 int i; | |
| 260 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
261 for (i = 0; i < gap_array_length (rt->entries); i++) |
| 428 | 262 { |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
263 struct range_table_entry *rte = rangetab_gap_array_atp (rt->entries, i); |
| 428 | 264 assert (rte->last >= rte->first); |
| 265 if (i > 0) | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
266 assert (rangetab_gap_array_at (rt->entries, i - 1).last <= rte->first); |
| 428 | 267 } |
| 268 } | |
| 269 | |
| 270 #else | |
| 271 | |
| 272 #define verify_range_table(rt) | |
| 273 | |
| 274 #endif | |
| 275 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
276 /* Locate the range table entry corresponding to the value POS, and return |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
277 it. If found, FOUNDP is set to 1 and the return value specifies an entry |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
278 that encloses POS. Otherwise, FOUNDP is set to 0 and the return value |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
279 specifies where an entry that encloses POS would be inserted. */ |
| 428 | 280 |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
281 static Elemcount |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
282 get_range_table_pos (Elemcount pos, Elemcount nentries, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
283 struct range_table_entry *tab, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
284 Elemcount gappos, Elemcount gapsize, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
285 int *foundp) |
| 428 | 286 { |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
287 Elemcount left = 0, right = nentries; |
| 428 | 288 |
| 289 /* binary search for the entry. Based on similar code in | |
| 290 extent_list_locate(). */ | |
| 291 while (left != right) | |
| 292 { | |
| 293 /* RIGHT might not point to a valid entry (i.e. it's at the end | |
| 294 of the list), so NEWPOS must round down. */ | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
295 Elemcount newpos = (left + right) >> 1; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
296 struct range_table_entry *entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
297 tab + GAP_ARRAY_ARRAY_TO_MEMORY_POS_1 (newpos, gappos, gapsize); |
| 2421 | 298 if (pos >= entry->last) |
| 299 left = newpos + 1; | |
| 428 | 300 else if (pos < entry->first) |
| 301 right = newpos; | |
| 302 else | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
303 { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
304 *foundp = 1; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
305 return newpos; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
306 } |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
307 } |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
308 |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
309 *foundp = 0; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
310 return left; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
311 } |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
312 |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
313 /* Look up in a range table without the gap array wrapper. |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
314 Used also by the unified range table format. */ |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
315 |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
316 static Lisp_Object |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
317 get_range_table (Elemcount pos, Elemcount nentries, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
318 struct range_table_entry *tab, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
319 Elemcount gappos, Elemcount gapsize, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
320 Lisp_Object default_) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
321 { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
322 int foundp; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
323 Elemcount entrypos = get_range_table_pos (pos, nentries, tab, gappos, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
324 gapsize, &foundp); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
325 if (foundp) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
326 { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
327 struct range_table_entry *entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
328 tab + GAP_ARRAY_ARRAY_TO_MEMORY_POS_1 (entrypos, gappos, gapsize); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
329 return entry->val; |
| 428 | 330 } |
| 331 | |
| 332 return default_; | |
| 333 } | |
| 334 | |
| 335 DEFUN ("range-table-p", Frange_table_p, 1, 1, 0, /* | |
| 336 Return non-nil if OBJECT is a range table. | |
| 337 */ | |
| 338 (object)) | |
| 339 { | |
| 340 return RANGE_TABLEP (object) ? Qt : Qnil; | |
| 341 } | |
| 342 | |
| 2421 | 343 DEFUN ("range-table-type", Frange_table_type, 1, 1, 0, /* |
|
4713
312503644bc3
Correct the docstring for #'range-table-type.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4690
diff
changeset
|
344 Return the type of RANGE-TABLE. |
|
312503644bc3
Correct the docstring for #'range-table-type.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4690
diff
changeset
|
345 |
|
312503644bc3
Correct the docstring for #'range-table-type.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4690
diff
changeset
|
346 This will be a symbol describing how ranges in RANGE-TABLE function at their |
|
312503644bc3
Correct the docstring for #'range-table-type.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4690
diff
changeset
|
347 ends; see `make-range-table'. |
| 2421 | 348 */ |
| 349 (range_table)) | |
| 350 { | |
| 351 CHECK_RANGE_TABLE (range_table); | |
| 352 return range_table_type_to_symbol (XRANGE_TABLE (range_table)->type); | |
| 353 } | |
| 354 | |
| 355 DEFUN ("make-range-table", Fmake_range_table, 0, 1, 0, /* | |
| 428 | 356 Return a new, empty range table. |
| 357 You can manipulate it using `put-range-table', `get-range-table', | |
| 358 `remove-range-table', and `clear-range-table'. | |
| 2421 | 359 Range tables allow you to efficiently set values for ranges of integers. |
| 360 | |
| 361 TYPE is a symbol indicating how ranges are assumed to function at their | |
| 362 ends. It can be one of | |
| 363 | |
| 364 SYMBOL RANGE-START RANGE-END | |
| 365 ------ ----------- --------- | |
| 366 `start-closed-end-open' (the default) closed open | |
| 367 `start-closed-end-closed' closed closed | |
| 368 `start-open-end-open' open open | |
| 369 `start-open-end-closed' open closed | |
| 370 | |
| 371 A `closed' endpoint of a range means that the number at that end is included | |
| 372 in the range. For an `open' endpoint, the number would not be included. | |
| 373 | |
| 374 For example, a closed-open range from 5 to 20 would be indicated as [5, | |
| 375 20) where a bracket indicates a closed end and a parenthesis an open end, | |
| 376 and would mean `all the numbers between 5 and 20', including 5 but not 20. | |
| 377 This seems a little strange at first but is in fact extremely common in | |
| 378 the outside world as well as in computers and makes things work sensibly. | |
| 379 For example, if I say "there are seven days between today and next week | |
| 380 today", I'm including today but not next week today; if I included both, | |
| 381 there would be eight days. Similarly, there are 15 (= 20 - 5) elements in | |
| 382 the range [5, 20), but 16 in the range [5, 20]. | |
| 428 | 383 */ |
| 2421 | 384 (type)) |
| 428 | 385 { |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
386 Lisp_Object obj = ALLOC_NORMAL_LISP_OBJECT (range_table); |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
387 Lisp_Range_Table *rt = XRANGE_TABLE (obj); |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
388 rt->entries = make_gap_array (sizeof (struct range_table_entry), 0); |
| 2421 | 389 rt->type = range_table_symbol_to_type (type); |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
390 return obj; |
| 428 | 391 } |
| 392 | |
| 393 DEFUN ("copy-range-table", Fcopy_range_table, 1, 1, 0, /* | |
| 444 | 394 Return a new range table which is a copy of RANGE-TABLE. |
| 395 It will contain the same values for the same ranges as RANGE-TABLE. | |
| 396 The values will not themselves be copied. | |
| 428 | 397 */ |
| 444 | 398 (range_table)) |
| 428 | 399 { |
| 440 | 400 Lisp_Range_Table *rt, *rtnew; |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
401 Lisp_Object obj; |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
402 Elemcount i; |
| 428 | 403 |
| 444 | 404 CHECK_RANGE_TABLE (range_table); |
| 405 rt = XRANGE_TABLE (range_table); | |
| 428 | 406 |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
407 obj = ALLOC_NORMAL_LISP_OBJECT (range_table); |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
408 rtnew = XRANGE_TABLE (obj); |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
409 rtnew->entries = make_gap_array (sizeof (struct range_table_entry), 0); |
| 2421 | 410 rtnew->type = rt->type; |
| 428 | 411 |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
412 for (i = 0; i < gap_array_length (rt->entries); i++) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
413 rtnew->entries = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
414 gap_array_insert_els (rtnew->entries, i, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
415 rangetab_gap_array_atp (rt->entries, i), 1); |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
416 return obj; |
| 428 | 417 } |
| 418 | |
| 419 DEFUN ("get-range-table", Fget_range_table, 2, 3, 0, /* | |
| 444 | 420 Find value for position POS in RANGE-TABLE. |
| 428 | 421 If there is no corresponding value, return DEFAULT (defaults to nil). |
| 422 */ | |
| 444 | 423 (pos, range_table, default_)) |
| 428 | 424 { |
| 440 | 425 Lisp_Range_Table *rt; |
| 428 | 426 |
| 444 | 427 CHECK_RANGE_TABLE (range_table); |
| 428 rt = XRANGE_TABLE (range_table); | |
| 428 | 429 |
| 430 CHECK_INT_COERCE_CHAR (pos); | |
| 431 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
432 return get_range_table (XINT (pos), gap_array_length (rt->entries), |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
433 gap_array_begin (rt->entries, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
434 struct range_table_entry), |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
435 gap_array_gappos (rt->entries), |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
436 gap_array_gapsize (rt->entries), |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
437 default_); |
| 428 | 438 } |
| 439 | |
|
4831
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
440 static void |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
441 external_to_internal_adjust_ends (enum range_table_type type, |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
442 EMACS_INT *first, EMACS_INT *last) |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
443 { |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
444 /* Fix up the numbers in accordance with the open/closedness to make |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
445 them behave like default open/closed. */ |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
446 switch (type) |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
447 { |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
448 case RANGE_START_CLOSED_END_OPEN: break; |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
449 case RANGE_START_CLOSED_END_CLOSED: (*last)++; break; |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
450 case RANGE_START_OPEN_END_OPEN: (*first)++; break; |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
451 case RANGE_START_OPEN_END_CLOSED: (*first)++, (*last)++; break; |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
452 } |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
453 } |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
454 |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
455 static void |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
456 internal_to_external_adjust_ends (enum range_table_type type, |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
457 EMACS_INT *first, EMACS_INT *last) |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
458 { |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
459 /* Reverse the changes made in external_to_internal_adjust_ends(). |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
460 */ |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
461 switch (type) |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
462 { |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
463 case RANGE_START_CLOSED_END_OPEN: break; |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
464 case RANGE_START_CLOSED_END_CLOSED: (*last)--; break; |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
465 case RANGE_START_OPEN_END_OPEN: (*first)--; break; |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
466 case RANGE_START_OPEN_END_CLOSED: (*first)--, (*last)--; break; |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
467 } |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
468 } |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
469 |
| 428 | 470 void |
| 471 put_range_table (Lisp_Object table, EMACS_INT first, | |
| 472 EMACS_INT last, Lisp_Object val) | |
| 473 { | |
| 474 int i; | |
| 475 int insert_me_here = -1; | |
| 440 | 476 Lisp_Range_Table *rt = XRANGE_TABLE (table); |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
477 int foundp; |
| 428 | 478 |
|
4831
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
479 external_to_internal_adjust_ends (rt->type, &first, &last); |
| 2421 | 480 if (first == last) |
| 481 return; | |
| 482 if (first > last) | |
| 483 /* This will happen if originally first == last and both ends are | |
| 484 open. #### Should we signal an error? */ | |
| 485 return; | |
| 486 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
487 if (DUMPEDP (rt->entries)) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
488 rt->entries = gap_array_clone (rt->entries); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
489 |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
490 i = get_range_table_pos (first, gap_array_length (rt->entries), |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
491 gap_array_begin (rt->entries, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
492 struct range_table_entry), |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
493 gap_array_gappos (rt->entries), |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
494 gap_array_gapsize (rt->entries), &foundp); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
495 |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
496 #ifdef ERROR_CHECK_TYPES |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
497 if (foundp) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
498 { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
499 if (i < gap_array_length (rt->entries)) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
500 { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
501 struct range_table_entry *entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
502 rangetab_gap_array_atp (rt->entries, i); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
503 assert (first >= entry->first && first < entry->last); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
504 } |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
505 } |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
506 else |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
507 { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
508 if (i < gap_array_length (rt->entries)) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
509 { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
510 struct range_table_entry *entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
511 rangetab_gap_array_atp (rt->entries, i); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
512 assert (first < entry->first); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
513 } |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
514 if (i > 0) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
515 { |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
516 struct range_table_entry *entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
517 rangetab_gap_array_atp (rt->entries, i - 1); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
518 assert (first >= entry->last); |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
519 } |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
520 } |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
521 #endif /* ERROR_CHECK_TYPES */ |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
522 |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
523 /* If the beginning of the new range isn't within any existing range, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
524 it might still be just grazing the end of an end-open range (remember, |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
525 internally all ranges are start-close end-open); so back up one |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
526 so we consider this range. */ |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
527 if (!foundp && i > 0) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
528 i--; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
529 |
| 428 | 530 /* Now insert in the proper place. This gets tricky because |
| 531 we may be overlapping one or more existing ranges and need | |
| 532 to fix them up. */ | |
| 533 | |
| 534 /* First delete all sections of any existing ranges that overlap | |
| 535 the new range. */ | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
536 for (; i < gap_array_length (rt->entries); i++) |
| 428 | 537 { |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
538 struct range_table_entry *entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
539 rangetab_gap_array_atp (rt->entries, i); |
| 428 | 540 /* We insert before the first range that begins at or after the |
| 541 new range. */ | |
| 542 if (entry->first >= first && insert_me_here < 0) | |
| 543 insert_me_here = i; | |
| 544 if (entry->last < first) | |
| 545 /* completely before the new range. */ | |
| 546 continue; | |
| 547 if (entry->first > last) | |
| 548 /* completely after the new range. No more possibilities of | |
| 549 finding overlapping ranges. */ | |
| 550 break; | |
| 2421 | 551 /* At this point the existing ENTRY overlaps or touches the new one. */ |
| 428 | 552 if (entry->first < first && entry->last <= last) |
| 553 { | |
| 554 /* looks like: | |
| 555 | |
| 2421 | 556 [ NEW ) |
| 557 [ EXISTING ) | |
| 558 | |
| 559 or | |
| 560 | |
| 561 [ NEW ) | |
| 562 [ EXISTING ) | |
| 428 | 563 |
| 564 */ | |
| 565 /* truncate the end off of it. */ | |
| 2421 | 566 entry->last = first; |
| 428 | 567 } |
| 568 else if (entry->first < first && entry->last > last) | |
| 569 /* looks like: | |
| 570 | |
| 2421 | 571 [ NEW ) |
| 572 [ EXISTING ) | |
| 428 | 573 |
| 574 */ | |
| 575 /* need to split this one in two. */ | |
| 576 { | |
| 577 struct range_table_entry insert_me_too; | |
| 578 | |
| 2421 | 579 insert_me_too.first = last; |
| 428 | 580 insert_me_too.last = entry->last; |
| 581 insert_me_too.val = entry->val; | |
| 2421 | 582 entry->last = first; |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
583 rt->entries = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
584 gap_array_insert_els (rt->entries, i + 1, &insert_me_too, 1); |
| 428 | 585 } |
| 2421 | 586 else if (entry->last >= last) |
| 428 | 587 { |
| 588 /* looks like: | |
| 589 | |
| 2421 | 590 [ NEW ) |
| 591 [ EXISTING ) | |
| 592 | |
| 593 or | |
| 594 | |
| 595 [ NEW ) | |
| 596 [ EXISTING ) | |
| 428 | 597 |
| 598 */ | |
| 599 /* truncate the start off of it. */ | |
| 2421 | 600 entry->first = last; |
| 428 | 601 } |
| 602 else | |
| 603 { | |
| 604 /* existing is entirely within new. */ | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
605 gap_array_delete_els (rt->entries, i, 1); |
| 428 | 606 i--; /* back up since everything shifted one to the left. */ |
| 607 } | |
| 608 } | |
| 609 | |
| 610 /* Someone asked us to delete the range, not insert it. */ | |
| 611 if (UNBOUNDP (val)) | |
| 612 return; | |
| 613 | |
| 614 /* Now insert the new entry, maybe at the end. */ | |
| 615 | |
| 616 if (insert_me_here < 0) | |
| 617 insert_me_here = i; | |
| 618 | |
| 619 { | |
| 620 struct range_table_entry insert_me; | |
| 621 | |
| 622 insert_me.first = first; | |
| 623 insert_me.last = last; | |
| 624 insert_me.val = val; | |
| 625 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
626 rt->entries = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
627 gap_array_insert_els (rt->entries, insert_me_here, &insert_me, 1); |
| 428 | 628 } |
| 629 | |
| 630 /* Now see if we can combine this entry with adjacent ones just | |
| 631 before or after. */ | |
| 632 | |
| 633 if (insert_me_here > 0) | |
| 634 { | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
635 struct range_table_entry *entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
636 rangetab_gap_array_atp (rt->entries, insert_me_here - 1); |
| 2421 | 637 if (EQ (val, entry->val) && entry->last == first) |
| 428 | 638 { |
| 639 entry->last = last; | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
640 gap_array_delete_els (rt->entries, insert_me_here, 1); |
| 428 | 641 insert_me_here--; |
| 642 /* We have morphed into a larger range. Update our records | |
| 643 in case we also combine with the one after. */ | |
| 644 first = entry->first; | |
| 645 } | |
| 646 } | |
| 647 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
648 if (insert_me_here < gap_array_length (rt->entries) - 1) |
| 428 | 649 { |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
650 struct range_table_entry *entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
651 rangetab_gap_array_atp (rt->entries, insert_me_here + 1); |
| 2421 | 652 if (EQ (val, entry->val) && entry->first == last) |
| 428 | 653 { |
| 654 entry->first = first; | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
655 gap_array_delete_els (rt->entries, insert_me_here, 1); |
| 428 | 656 } |
| 657 } | |
| 658 } | |
| 659 | |
| 660 DEFUN ("put-range-table", Fput_range_table, 4, 4, 0, /* | |
| 2421 | 661 Set the value for range START .. END to be VALUE in RANGE-TABLE. |
| 428 | 662 */ |
| 444 | 663 (start, end, value, range_table)) |
| 428 | 664 { |
| 665 EMACS_INT first, last; | |
| 666 | |
| 444 | 667 CHECK_RANGE_TABLE (range_table); |
| 428 | 668 CHECK_INT_COERCE_CHAR (start); |
| 669 first = XINT (start); | |
| 670 CHECK_INT_COERCE_CHAR (end); | |
| 671 last = XINT (end); | |
| 672 if (first > last) | |
| 563 | 673 invalid_argument_2 ("start must be <= end", start, end); |
| 428 | 674 |
| 444 | 675 put_range_table (range_table, first, last, value); |
| 676 verify_range_table (XRANGE_TABLE (range_table)); | |
| 428 | 677 return Qnil; |
| 678 } | |
| 679 | |
| 680 DEFUN ("remove-range-table", Fremove_range_table, 3, 3, 0, /* | |
| 2421 | 681 Remove the value for range START .. END in RANGE-TABLE. |
| 428 | 682 */ |
| 444 | 683 (start, end, range_table)) |
| 428 | 684 { |
| 444 | 685 return Fput_range_table (start, end, Qunbound, range_table); |
| 428 | 686 } |
| 687 | |
| 688 DEFUN ("clear-range-table", Fclear_range_table, 1, 1, 0, /* | |
| 444 | 689 Flush RANGE-TABLE. |
| 428 | 690 */ |
| 444 | 691 (range_table)) |
| 428 | 692 { |
| 444 | 693 CHECK_RANGE_TABLE (range_table); |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
694 gap_array_delete_all_els (XRANGE_TABLE (range_table)->entries); |
| 428 | 695 return Qnil; |
| 696 } | |
| 697 | |
| 698 DEFUN ("map-range-table", Fmap_range_table, 2, 2, 0, /* | |
| 444 | 699 Map FUNCTION over entries in RANGE-TABLE, calling it with three args, |
| 428 | 700 the beginning and end of the range and the corresponding value. |
| 442 | 701 |
| 702 Results are guaranteed to be correct (i.e. each entry processed | |
| 703 exactly once) if FUNCTION modifies or deletes the current entry | |
| 444 | 704 \(i.e. passes the current range to `put-range-table' or |
|
4391
cbf129b005df
Clarify #'map-range-table docstring.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3017
diff
changeset
|
705 `remove-range-table'). If FUNCTION modifies or deletes any other entry, |
|
cbf129b005df
Clarify #'map-range-table docstring.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3017
diff
changeset
|
706 this guarantee doesn't hold. |
| 428 | 707 */ |
| 444 | 708 (function, range_table)) |
| 428 | 709 { |
| 442 | 710 Lisp_Range_Table *rt; |
| 711 int i; | |
| 712 | |
| 444 | 713 CHECK_RANGE_TABLE (range_table); |
| 442 | 714 CHECK_FUNCTION (function); |
| 715 | |
| 444 | 716 rt = XRANGE_TABLE (range_table); |
| 442 | 717 |
| 718 /* Do not "optimize" by pulling out the length computation below! | |
| 719 FUNCTION may have changed the table. */ | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
720 for (i = 0; i < gap_array_length (rt->entries); i++) |
| 442 | 721 { |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
722 struct range_table_entry entry = |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
723 rangetab_gap_array_at (rt->entries, i); |
| 442 | 724 EMACS_INT first, last; |
| 725 Lisp_Object args[4]; | |
| 726 int oldlen; | |
| 727 | |
| 728 again: | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
729 first = entry.first; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
730 last = entry.last; |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
731 oldlen = gap_array_length (rt->entries); |
| 442 | 732 args[0] = function; |
| 2952 | 733 /* Fix up the numbers in accordance with the open/closedness of the |
| 734 table. */ | |
| 735 { | |
| 736 EMACS_INT premier = first, dernier = last; | |
|
4831
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
737 internal_to_external_adjust_ends (rt->type, &premier, &dernier); |
| 2952 | 738 args[1] = make_int (premier); |
| 739 args[2] = make_int (dernier); | |
| 740 } | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
741 args[3] = entry.val; |
| 442 | 742 Ffuncall (countof (args), args); |
| 743 /* Has FUNCTION removed the entry? */ | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
744 if (oldlen > gap_array_length (rt->entries) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
745 && i < gap_array_length (rt->entries) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
746 && (first != entry.first || last != entry.last)) |
| 442 | 747 goto again; |
| 748 } | |
| 749 | |
| 428 | 750 return Qnil; |
| 751 } | |
| 752 | |
| 753 | |
| 754 /************************************************************************/ | |
| 755 /* Range table read syntax */ | |
| 756 /************************************************************************/ | |
| 757 | |
| 758 static int | |
| 2421 | 759 rangetab_type_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 760 Error_Behavior UNUSED (errb)) | |
| 761 { | |
| 762 /* #### should deal with ERRB */ | |
| 763 range_table_symbol_to_type (value); | |
| 764 return 1; | |
| 765 } | |
| 766 | |
| 767 static int | |
| 2286 | 768 rangetab_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, |
| 769 Error_Behavior UNUSED (errb)) | |
| 428 | 770 { |
| 2367 | 771 /* #### should deal with ERRB */ |
| 772 EXTERNAL_PROPERTY_LIST_LOOP_3 (range, data, value) | |
| 428 | 773 { |
| 774 if (!INTP (range) && !CHARP (range) | |
| 775 && !(CONSP (range) && CONSP (XCDR (range)) | |
| 776 && NILP (XCDR (XCDR (range))) | |
| 777 && (INTP (XCAR (range)) || CHARP (XCAR (range))) | |
| 778 && (INTP (XCAR (XCDR (range))) || CHARP (XCAR (XCDR (range)))))) | |
| 563 | 779 sferror ("Invalid range format", range); |
| 428 | 780 } |
| 781 | |
| 782 return 1; | |
| 783 } | |
| 784 | |
| 785 static Lisp_Object | |
| 2421 | 786 rangetab_instantiate (Lisp_Object plist) |
| 428 | 787 { |
| 2425 | 788 Lisp_Object data = Qnil, type = Qnil, rangetab; |
| 428 | 789 |
| 2421 | 790 PROPERTY_LIST_LOOP_3 (key, value, plist) |
| 428 | 791 { |
| 2421 | 792 if (EQ (key, Qtype)) type = value; |
| 793 else if (EQ (key, Qdata)) data = value; | |
| 794 else | |
| 2500 | 795 ABORT (); |
| 2421 | 796 } |
| 797 | |
| 2425 | 798 rangetab = Fmake_range_table (type); |
| 428 | 799 |
| 2421 | 800 { |
| 801 PROPERTY_LIST_LOOP_3 (range, val, data) | |
| 802 { | |
| 803 if (CONSP (range)) | |
| 804 Fput_range_table (Fcar (range), Fcar (Fcdr (range)), val, | |
| 805 rangetab); | |
| 806 else | |
| 807 Fput_range_table (range, range, val, rangetab); | |
| 808 } | |
| 809 } | |
| 428 | 810 |
| 811 return rangetab; | |
| 812 } | |
| 813 | |
| 814 | |
| 815 /************************************************************************/ | |
| 816 /* Unified range tables */ | |
| 817 /************************************************************************/ | |
| 818 | |
| 819 /* A "unified range table" is a format for storing range tables | |
| 820 as contiguous blocks of memory. This is used by the regexp | |
| 821 code, which needs to use range tables to properly handle [] | |
| 822 constructs in the presence of extended characters but wants to | |
| 823 store an entire compiled pattern as a contiguous block of memory. | |
| 824 | |
| 825 Unified range tables are designed so that they can be placed | |
| 826 at an arbitrary (possibly mis-aligned) place in memory. | |
| 827 (Dealing with alignment is a pain in the ass.) | |
| 828 | |
| 829 WARNING: No provisions for garbage collection are currently made. | |
| 830 This means that there must not be any Lisp objects in a unified | |
| 831 range table that need to be marked for garbage collection. | |
| 832 Good candidates for objects that can go into a range table are | |
| 833 | |
| 834 -- numbers and characters (do not need to be marked) | |
| 835 -- nil, t (marked elsewhere) | |
| 836 -- charsets and coding systems (automatically marked because | |
| 837 they are in a marked list, | |
| 838 and can't be removed) | |
| 839 | |
| 840 Good but slightly less so: | |
| 841 | |
| 842 -- symbols (could be uninterned, but that is not likely) | |
| 843 | |
| 844 Somewhat less good: | |
| 845 | |
| 846 -- buffers, frames, devices (could get deleted) | |
| 847 | |
| 848 | |
| 849 It is expected that you work with range tables in the normal | |
| 850 format and then convert to unified format when you are done | |
| 851 making modifications. As such, no functions are provided | |
| 852 for modifying a unified range table. The only operations | |
| 853 you can do to unified range tables are | |
| 854 | |
| 855 -- look up a value | |
| 856 -- retrieve all the ranges in an iterative fashion | |
| 857 | |
| 858 */ | |
| 859 | |
| 860 /* The format of a unified range table is as follows: | |
| 861 | |
| 862 -- The first byte contains the number of bytes to skip to find the | |
| 863 actual start of the table. This deals with alignment constraints, | |
| 864 since the table might want to go at any arbitrary place in memory. | |
| 865 -- The next three bytes contain the number of bytes to skip (from the | |
| 866 *first* byte) to find the stuff after the table. It's stored in | |
| 867 little-endian format because that's how God intended things. We don't | |
| 868 necessarily start the stuff at the very end of the table because | |
| 869 we want to have at least ALIGNOF (EMACS_INT) extra space in case | |
| 870 we have to move the range table around. (It appears that some | |
| 871 architectures don't maintain alignment when reallocing.) | |
| 872 -- At the prescribed offset is a struct unified_range_table, containing | |
| 873 some number of `struct range_table_entry' entries. */ | |
| 874 | |
| 875 struct unified_range_table | |
| 876 { | |
| 877 int nentries; | |
|
4831
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
878 enum range_table_type type; |
| 428 | 879 struct range_table_entry first; |
| 880 }; | |
| 881 | |
| 882 /* Return size in bytes needed to store the data in a range table. */ | |
| 883 | |
| 884 int | |
| 885 unified_range_table_bytes_needed (Lisp_Object rangetab) | |
| 886 { | |
| 887 return (sizeof (struct range_table_entry) * | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
888 (gap_array_length (XRANGE_TABLE (rangetab)->entries) - 1) + |
| 428 | 889 sizeof (struct unified_range_table) + |
| 890 /* ALIGNOF a struct may be too big. */ | |
| 891 /* We have four bytes for the size numbers, and an extra | |
| 892 four or eight bytes for making sure we get the alignment | |
| 893 OK. */ | |
| 894 ALIGNOF (EMACS_INT) + 4); | |
| 895 } | |
| 896 | |
| 897 /* Convert a range table into unified format and store in DEST, | |
| 898 which must be able to hold the number of bytes returned by | |
| 899 range_table_bytes_needed(). */ | |
| 900 | |
| 901 void | |
| 902 unified_range_table_copy_data (Lisp_Object rangetab, void *dest) | |
| 903 { | |
| 904 /* We cast to the above structure rather than just casting to | |
| 905 char * and adding sizeof(int), because that will lead to | |
| 906 mis-aligned data on the Alpha machines. */ | |
| 907 struct unified_range_table *un; | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
908 Gap_Array *rtega = XRANGE_TABLE (rangetab)->entries; |
| 428 | 909 int total_needed = unified_range_table_bytes_needed (rangetab); |
| 826 | 910 void *new_dest = ALIGN_PTR ((char *) dest + 4, EMACS_INT); |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
911 Elemcount i; |
| 428 | 912 |
| 913 * (char *) dest = (char) ((char *) new_dest - (char *) dest); | |
| 914 * ((unsigned char *) dest + 1) = total_needed & 0xFF; | |
| 915 total_needed >>= 8; | |
| 916 * ((unsigned char *) dest + 2) = total_needed & 0xFF; | |
| 917 total_needed >>= 8; | |
| 918 * ((unsigned char *) dest + 3) = total_needed & 0xFF; | |
| 919 un = (struct unified_range_table *) new_dest; | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
920 un->nentries = gap_array_length (rtega); |
|
4831
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
921 un->type = XRANGE_TABLE (rangetab)->type; |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
922 for (i = 0; i < gap_array_length (rtega); i++) |
|
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
923 (&un->first)[i] = rangetab_gap_array_at (rtega, i); |
| 428 | 924 } |
| 925 | |
| 926 /* Return number of bytes actually used by a unified range table. */ | |
| 927 | |
| 928 int | |
| 929 unified_range_table_bytes_used (void *unrangetab) | |
| 930 { | |
| 931 return ((* ((unsigned char *) unrangetab + 1)) | |
| 932 + ((* ((unsigned char *) unrangetab + 2)) << 8) | |
| 933 + ((* ((unsigned char *) unrangetab + 3)) << 16)); | |
| 934 } | |
| 935 | |
| 936 /* Make sure the table is aligned, and move it around if it's not. */ | |
| 937 static void | |
| 938 align_the_damn_table (void *unrangetab) | |
| 939 { | |
| 940 void *cur_dest = (char *) unrangetab + * (char *) unrangetab; | |
| 826 | 941 if (cur_dest != ALIGN_PTR (cur_dest, EMACS_INT)) |
| 428 | 942 { |
| 943 int count = (unified_range_table_bytes_used (unrangetab) - 4 | |
| 944 - ALIGNOF (EMACS_INT)); | |
| 945 /* Find the proper location, just like above. */ | |
| 826 | 946 void *new_dest = ALIGN_PTR ((char *) unrangetab + 4, EMACS_INT); |
| 428 | 947 /* memmove() works in the presence of overlapping data. */ |
| 948 memmove (new_dest, cur_dest, count); | |
| 949 * (char *) unrangetab = (char) ((char *) new_dest - (char *) unrangetab); | |
| 950 } | |
| 951 } | |
| 952 | |
| 953 /* Look up a value in a unified range table. */ | |
| 954 | |
| 955 Lisp_Object | |
| 956 unified_range_table_lookup (void *unrangetab, EMACS_INT pos, | |
| 957 Lisp_Object default_) | |
| 958 { | |
| 959 void *new_dest; | |
| 960 struct unified_range_table *un; | |
| 961 | |
| 962 align_the_damn_table (unrangetab); | |
| 963 new_dest = (char *) unrangetab + * (char *) unrangetab; | |
| 964 un = (struct unified_range_table *) new_dest; | |
| 965 | |
|
5168
cf900a2f1fa3
extract gap array from extents.c, use in range tables
Ben Wing <ben@xemacs.org>
parents:
5146
diff
changeset
|
966 return get_range_table (pos, un->nentries, &un->first, 0, 0, default_); |
| 428 | 967 } |
| 968 | |
| 969 /* Return number of entries in a unified range table. */ | |
| 970 | |
| 971 int | |
| 972 unified_range_table_nentries (void *unrangetab) | |
| 973 { | |
| 974 void *new_dest; | |
| 975 struct unified_range_table *un; | |
| 976 | |
| 977 align_the_damn_table (unrangetab); | |
| 978 new_dest = (char *) unrangetab + * (char *) unrangetab; | |
| 979 un = (struct unified_range_table *) new_dest; | |
| 980 return un->nentries; | |
| 981 } | |
| 982 | |
| 983 /* Return the OFFSETth range (counting from 0) in UNRANGETAB. */ | |
| 984 void | |
| 985 unified_range_table_get_range (void *unrangetab, int offset, | |
| 986 EMACS_INT *min, EMACS_INT *max, | |
| 987 Lisp_Object *val) | |
| 988 { | |
| 989 void *new_dest; | |
| 990 struct unified_range_table *un; | |
| 991 struct range_table_entry *tab; | |
| 992 | |
| 993 align_the_damn_table (unrangetab); | |
| 994 new_dest = (char *) unrangetab + * (char *) unrangetab; | |
| 995 un = (struct unified_range_table *) new_dest; | |
| 996 | |
| 997 assert (offset >= 0 && offset < un->nentries); | |
| 998 tab = (&un->first) + offset; | |
| 999 *min = tab->first; | |
| 1000 *max = tab->last; | |
| 1001 *val = tab->val; | |
|
4831
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
1002 |
|
2e15c29cc2b3
fix bug in returning range table ends in unified range table code
Ben Wing <ben@xemacs.org>
parents:
4713
diff
changeset
|
1003 internal_to_external_adjust_ends (un->type, min, max); |
| 428 | 1004 } |
| 1005 | |
| 1006 | |
| 1007 /************************************************************************/ | |
| 1008 /* Initialization */ | |
| 1009 /************************************************************************/ | |
| 1010 | |
| 1011 void | |
| 1012 syms_of_rangetab (void) | |
| 1013 { | |
|
5117
3742ea8250b5
Checking in final CVS version of workspace 'ben-lisp-object'
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
1014 INIT_LISP_OBJECT (range_table); |
| 442 | 1015 |
| 563 | 1016 DEFSYMBOL_MULTIWORD_PREDICATE (Qrange_tablep); |
| 1017 DEFSYMBOL (Qrange_table); | |
| 428 | 1018 |
| 2421 | 1019 DEFSYMBOL (Qstart_closed_end_open); |
| 1020 DEFSYMBOL (Qstart_open_end_open); | |
| 1021 DEFSYMBOL (Qstart_closed_end_closed); | |
| 1022 DEFSYMBOL (Qstart_open_end_closed); | |
| 1023 | |
| 428 | 1024 DEFSUBR (Frange_table_p); |
| 2421 | 1025 DEFSUBR (Frange_table_type); |
| 428 | 1026 DEFSUBR (Fmake_range_table); |
| 1027 DEFSUBR (Fcopy_range_table); | |
| 1028 DEFSUBR (Fget_range_table); | |
| 1029 DEFSUBR (Fput_range_table); | |
| 1030 DEFSUBR (Fremove_range_table); | |
| 1031 DEFSUBR (Fclear_range_table); | |
| 1032 DEFSUBR (Fmap_range_table); | |
| 1033 } | |
| 1034 | |
| 1035 void | |
| 1036 structure_type_create_rangetab (void) | |
| 1037 { | |
| 1038 struct structure_type *st; | |
| 1039 | |
| 1040 st = define_structure_type (Qrange_table, 0, rangetab_instantiate); | |
| 1041 | |
| 1042 define_structure_type_keyword (st, Qdata, rangetab_data_validate); | |
| 2421 | 1043 define_structure_type_keyword (st, Qtype, rangetab_type_validate); |
| 428 | 1044 } |