Mercurial > hg > xemacs-beta
view src/rangetab.c @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Mar 2010 04:08:17 -0600 |
parents | b5df3737028a |
children | f965e31a35f0 |
line wrap: on
line source
/* XEmacs routines to deal with range tables. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 2002, 2004, 2005, 2010 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing, August 1995. */ #include <config.h> #include "lisp.h" #include "rangetab.h" Lisp_Object Qrange_tablep; Lisp_Object Qrange_table; Lisp_Object Qstart_closed_end_open; Lisp_Object Qstart_open_end_open; Lisp_Object Qstart_closed_end_closed; Lisp_Object Qstart_open_end_closed; /************************************************************************/ /* Range table object */ /************************************************************************/ static enum range_table_type range_table_symbol_to_type (Lisp_Object symbol) { if (NILP (symbol)) return RANGE_START_CLOSED_END_OPEN; CHECK_SYMBOL (symbol); if (EQ (symbol, Qstart_closed_end_open)) return RANGE_START_CLOSED_END_OPEN; if (EQ (symbol, Qstart_closed_end_closed)) return RANGE_START_CLOSED_END_CLOSED; if (EQ (symbol, Qstart_open_end_open)) return RANGE_START_OPEN_END_OPEN; if (EQ (symbol, Qstart_open_end_closed)) return RANGE_START_OPEN_END_CLOSED; invalid_constant ("Unknown range table type", symbol); RETURN_NOT_REACHED (RANGE_START_CLOSED_END_OPEN); } static Lisp_Object range_table_type_to_symbol (enum range_table_type type) { switch (type) { case RANGE_START_CLOSED_END_OPEN: return Qstart_closed_end_open; case RANGE_START_CLOSED_END_CLOSED: return Qstart_closed_end_closed; case RANGE_START_OPEN_END_OPEN: return Qstart_open_end_open; case RANGE_START_OPEN_END_CLOSED: return Qstart_open_end_closed; } ABORT (); return Qnil; } /* We use a sorted array of ranges. #### We should be using the gap array stuff from extents.c. This is not hard but just requires moving that stuff out of that file. */ static Lisp_Object mark_range_table (Lisp_Object obj) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; for (i = 0; i < Dynarr_length (rt->entries); i++) mark_object (Dynarr_at (rt->entries, i).val); return Qnil; } static void print_range_table (Lisp_Object obj, Lisp_Object printcharfun, int UNUSED (escapeflag)) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; if (print_readably) write_fmt_string_lisp (printcharfun, "#s(range-table type %s data (", 1, range_table_type_to_symbol (rt->type)); else write_ascstring (printcharfun, "#<range-table "); for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *rte = Dynarr_atp (rt->entries, i); int so, ec; if (i > 0) write_ascstring (printcharfun, " "); switch (rt->type) { case RANGE_START_CLOSED_END_OPEN: so = 0, ec = 0; break; case RANGE_START_CLOSED_END_CLOSED: so = 0, ec = 1; break; case RANGE_START_OPEN_END_OPEN: so = 1, ec = 0; break; case RANGE_START_OPEN_END_CLOSED: so = 1; ec = 1; break; default: ABORT (); so = 0, ec = 0; break; } write_fmt_string (printcharfun, "%c%ld %ld%c ", print_readably ? '(' : so ? '(' : '[', (long) (rte->first - so), (long) (rte->last - ec), print_readably ? ')' : ec ? ']' : ')' ); print_internal (rte->val, printcharfun, 1); } if (print_readably) write_ascstring (printcharfun, "))"); else write_fmt_string (printcharfun, " 0x%x>", rt->header.uid); } static int range_table_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int foldcase) { Lisp_Range_Table *rt1 = XRANGE_TABLE (obj1); Lisp_Range_Table *rt2 = XRANGE_TABLE (obj2); int i; if (Dynarr_length (rt1->entries) != Dynarr_length (rt2->entries)) return 0; for (i = 0; i < Dynarr_length (rt1->entries); i++) { struct range_table_entry *rte1 = Dynarr_atp (rt1->entries, i); struct range_table_entry *rte2 = Dynarr_atp (rt2->entries, i); if (rte1->first != rte2->first || rte1->last != rte2->last || !internal_equal_0 (rte1->val, rte2->val, depth + 1, foldcase)) return 0; } return 1; } static Hashcode range_table_entry_hash (struct range_table_entry *rte, int depth) { return HASH3 (rte->first, rte->last, internal_hash (rte->val, depth + 1)); } static Hashcode range_table_hash (Lisp_Object obj, int depth) { Lisp_Range_Table *rt = XRANGE_TABLE (obj); int i; int size = Dynarr_length (rt->entries); Hashcode hash = size; /* approach based on internal_array_hash(). */ if (size <= 5) { for (i = 0; i < size; i++) hash = HASH2 (hash, range_table_entry_hash (Dynarr_atp (rt->entries, i), depth)); return hash; } /* just pick five elements scattered throughout the array. A slightly better approach would be to offset by some noise factor from the points chosen below. */ for (i = 0; i < 5; i++) hash = HASH2 (hash, range_table_entry_hash (Dynarr_atp (rt->entries, i*size/5), depth)); return hash; } static const struct memory_description rte_description_1[] = { { XD_LISP_OBJECT, offsetof (range_table_entry, val) }, { XD_END } }; static const struct sized_memory_description rte_description = { sizeof (range_table_entry), rte_description_1 }; static const struct memory_description rted_description_1[] = { XD_DYNARR_DESC (range_table_entry_dynarr, &rte_description), { XD_END } }; static const struct sized_memory_description rted_description = { sizeof (range_table_entry_dynarr), rted_description_1 }; static const struct memory_description range_table_description[] = { { XD_BLOCK_PTR, offsetof (Lisp_Range_Table, entries), 1, { &rted_description } }, { XD_END } }; DEFINE_DUMPABLE_LISP_OBJECT ("range-table", range_table, mark_range_table, print_range_table, 0, range_table_equal, range_table_hash, range_table_description, Lisp_Range_Table); /************************************************************************/ /* Range table operations */ /************************************************************************/ #ifdef ERROR_CHECK_STRUCTURES static void verify_range_table (Lisp_Range_Table *rt) { int i; for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *rte = Dynarr_atp (rt->entries, i); assert (rte->last >= rte->first); if (i > 0) assert (Dynarr_at (rt->entries, i - 1).last <= rte->first); } } #else #define verify_range_table(rt) #endif /* Look up in a range table without the Dynarr wrapper. Used also by the unified range table format. */ static Lisp_Object get_range_table (EMACS_INT pos, int nentries, struct range_table_entry *tab, Lisp_Object default_) { int left = 0, right = nentries; /* binary search for the entry. Based on similar code in extent_list_locate(). */ while (left != right) { /* RIGHT might not point to a valid entry (i.e. it's at the end of the list), so NEWPOS must round down. */ int newpos = (left + right) >> 1; struct range_table_entry *entry = tab + newpos; if (pos >= entry->last) left = newpos + 1; else if (pos < entry->first) right = newpos; else return entry->val; } return default_; } DEFUN ("range-table-p", Frange_table_p, 1, 1, 0, /* Return non-nil if OBJECT is a range table. */ (object)) { return RANGE_TABLEP (object) ? Qt : Qnil; } DEFUN ("range-table-type", Frange_table_type, 1, 1, 0, /* Return the type of RANGE-TABLE. This will be a symbol describing how ranges in RANGE-TABLE function at their ends; see `make-range-table'. */ (range_table)) { CHECK_RANGE_TABLE (range_table); return range_table_type_to_symbol (XRANGE_TABLE (range_table)->type); } DEFUN ("make-range-table", Fmake_range_table, 0, 1, 0, /* Return a new, empty range table. You can manipulate it using `put-range-table', `get-range-table', `remove-range-table', and `clear-range-table'. Range tables allow you to efficiently set values for ranges of integers. TYPE is a symbol indicating how ranges are assumed to function at their ends. It can be one of SYMBOL RANGE-START RANGE-END ------ ----------- --------- `start-closed-end-open' (the default) closed open `start-closed-end-closed' closed closed `start-open-end-open' open open `start-open-end-closed' open closed A `closed' endpoint of a range means that the number at that end is included in the range. For an `open' endpoint, the number would not be included. For example, a closed-open range from 5 to 20 would be indicated as [5, 20) where a bracket indicates a closed end and a parenthesis an open end, and would mean `all the numbers between 5 and 20', including 5 but not 20. This seems a little strange at first but is in fact extremely common in the outside world as well as in computers and makes things work sensibly. For example, if I say "there are seven days between today and next week today", I'm including today but not next week today; if I included both, there would be eight days. Similarly, there are 15 (= 20 - 5) elements in the range [5, 20), but 16 in the range [5, 20]. */ (type)) { Lisp_Object obj = ALLOC_NORMAL_LISP_OBJECT (range_table); Lisp_Range_Table *rt = XRANGE_TABLE (obj); rt->entries = Dynarr_new (range_table_entry); rt->type = range_table_symbol_to_type (type); return obj; } DEFUN ("copy-range-table", Fcopy_range_table, 1, 1, 0, /* Return a new range table which is a copy of RANGE-TABLE. It will contain the same values for the same ranges as RANGE-TABLE. The values will not themselves be copied. */ (range_table)) { Lisp_Range_Table *rt, *rtnew; Lisp_Object obj; CHECK_RANGE_TABLE (range_table); rt = XRANGE_TABLE (range_table); obj = ALLOC_NORMAL_LISP_OBJECT (range_table); rtnew = XRANGE_TABLE (obj); rtnew->entries = Dynarr_new (range_table_entry); rtnew->type = rt->type; Dynarr_add_many (rtnew->entries, Dynarr_begin (rt->entries), Dynarr_length (rt->entries)); return obj; } DEFUN ("get-range-table", Fget_range_table, 2, 3, 0, /* Find value for position POS in RANGE-TABLE. If there is no corresponding value, return DEFAULT (defaults to nil). */ (pos, range_table, default_)) { Lisp_Range_Table *rt; CHECK_RANGE_TABLE (range_table); rt = XRANGE_TABLE (range_table); CHECK_INT_COERCE_CHAR (pos); return get_range_table (XINT (pos), Dynarr_length (rt->entries), Dynarr_begin (rt->entries), default_); } static void external_to_internal_adjust_ends (enum range_table_type type, EMACS_INT *first, EMACS_INT *last) { /* Fix up the numbers in accordance with the open/closedness to make them behave like default open/closed. */ switch (type) { case RANGE_START_CLOSED_END_OPEN: break; case RANGE_START_CLOSED_END_CLOSED: (*last)++; break; case RANGE_START_OPEN_END_OPEN: (*first)++; break; case RANGE_START_OPEN_END_CLOSED: (*first)++, (*last)++; break; } } static void internal_to_external_adjust_ends (enum range_table_type type, EMACS_INT *first, EMACS_INT *last) { /* Reverse the changes made in external_to_internal_adjust_ends(). */ switch (type) { case RANGE_START_CLOSED_END_OPEN: break; case RANGE_START_CLOSED_END_CLOSED: (*last)--; break; case RANGE_START_OPEN_END_OPEN: (*first)--; break; case RANGE_START_OPEN_END_CLOSED: (*first)--, (*last)--; break; } } void put_range_table (Lisp_Object table, EMACS_INT first, EMACS_INT last, Lisp_Object val) { int i; int insert_me_here = -1; Lisp_Range_Table *rt = XRANGE_TABLE (table); external_to_internal_adjust_ends (rt->type, &first, &last); if (first == last) return; if (first > last) /* This will happen if originally first == last and both ends are open. #### Should we signal an error? */ return; /* Now insert in the proper place. This gets tricky because we may be overlapping one or more existing ranges and need to fix them up. */ /* First delete all sections of any existing ranges that overlap the new range. */ for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *entry = Dynarr_atp (rt->entries, i); /* We insert before the first range that begins at or after the new range. */ if (entry->first >= first && insert_me_here < 0) insert_me_here = i; if (entry->last < first) /* completely before the new range. */ continue; if (entry->first > last) /* completely after the new range. No more possibilities of finding overlapping ranges. */ break; /* At this point the existing ENTRY overlaps or touches the new one. */ if (entry->first < first && entry->last <= last) { /* looks like: [ NEW ) [ EXISTING ) or [ NEW ) [ EXISTING ) */ /* truncate the end off of it. */ entry->last = first; } else if (entry->first < first && entry->last > last) /* looks like: [ NEW ) [ EXISTING ) */ /* need to split this one in two. */ { struct range_table_entry insert_me_too; insert_me_too.first = last; insert_me_too.last = entry->last; insert_me_too.val = entry->val; entry->last = first; Dynarr_insert_many (rt->entries, &insert_me_too, 1, i + 1); } else if (entry->last >= last) { /* looks like: [ NEW ) [ EXISTING ) or [ NEW ) [ EXISTING ) */ /* truncate the start off of it. */ entry->first = last; } else { /* existing is entirely within new. */ Dynarr_delete_many (rt->entries, i, 1); i--; /* back up since everything shifted one to the left. */ } } /* Someone asked us to delete the range, not insert it. */ if (UNBOUNDP (val)) return; /* Now insert the new entry, maybe at the end. */ if (insert_me_here < 0) insert_me_here = i; { struct range_table_entry insert_me; insert_me.first = first; insert_me.last = last; insert_me.val = val; Dynarr_insert_many (rt->entries, &insert_me, 1, insert_me_here); } /* Now see if we can combine this entry with adjacent ones just before or after. */ if (insert_me_here > 0) { struct range_table_entry *entry = Dynarr_atp (rt->entries, insert_me_here - 1); if (EQ (val, entry->val) && entry->last == first) { entry->last = last; Dynarr_delete_many (rt->entries, insert_me_here, 1); insert_me_here--; /* We have morphed into a larger range. Update our records in case we also combine with the one after. */ first = entry->first; } } if (insert_me_here < Dynarr_length (rt->entries) - 1) { struct range_table_entry *entry = Dynarr_atp (rt->entries, insert_me_here + 1); if (EQ (val, entry->val) && entry->first == last) { entry->first = first; Dynarr_delete_many (rt->entries, insert_me_here, 1); } } } DEFUN ("put-range-table", Fput_range_table, 4, 4, 0, /* Set the value for range START .. END to be VALUE in RANGE-TABLE. */ (start, end, value, range_table)) { EMACS_INT first, last; CHECK_RANGE_TABLE (range_table); CHECK_INT_COERCE_CHAR (start); first = XINT (start); CHECK_INT_COERCE_CHAR (end); last = XINT (end); if (first > last) invalid_argument_2 ("start must be <= end", start, end); put_range_table (range_table, first, last, value); verify_range_table (XRANGE_TABLE (range_table)); return Qnil; } DEFUN ("remove-range-table", Fremove_range_table, 3, 3, 0, /* Remove the value for range START .. END in RANGE-TABLE. */ (start, end, range_table)) { return Fput_range_table (start, end, Qunbound, range_table); } DEFUN ("clear-range-table", Fclear_range_table, 1, 1, 0, /* Flush RANGE-TABLE. */ (range_table)) { CHECK_RANGE_TABLE (range_table); Dynarr_reset (XRANGE_TABLE (range_table)->entries); return Qnil; } DEFUN ("map-range-table", Fmap_range_table, 2, 2, 0, /* Map FUNCTION over entries in RANGE-TABLE, calling it with three args, the beginning and end of the range and the corresponding value. Results are guaranteed to be correct (i.e. each entry processed exactly once) if FUNCTION modifies or deletes the current entry \(i.e. passes the current range to `put-range-table' or `remove-range-table'). If FUNCTION modifies or deletes any other entry, this guarantee doesn't hold. */ (function, range_table)) { Lisp_Range_Table *rt; int i; CHECK_RANGE_TABLE (range_table); CHECK_FUNCTION (function); rt = XRANGE_TABLE (range_table); /* Do not "optimize" by pulling out the length computation below! FUNCTION may have changed the table. */ for (i = 0; i < Dynarr_length (rt->entries); i++) { struct range_table_entry *entry = Dynarr_atp (rt->entries, i); EMACS_INT first, last; Lisp_Object args[4]; int oldlen; again: first = entry->first; last = entry->last; oldlen = Dynarr_length (rt->entries); args[0] = function; /* Fix up the numbers in accordance with the open/closedness of the table. */ { EMACS_INT premier = first, dernier = last; internal_to_external_adjust_ends (rt->type, &premier, &dernier); args[1] = make_int (premier); args[2] = make_int (dernier); } args[3] = entry->val; Ffuncall (countof (args), args); /* Has FUNCTION removed the entry? */ if (oldlen > Dynarr_length (rt->entries) && i < Dynarr_length (rt->entries) && (first != entry->first || last != entry->last)) goto again; } return Qnil; } /************************************************************************/ /* Range table read syntax */ /************************************************************************/ static int rangetab_type_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, Error_Behavior UNUSED (errb)) { /* #### should deal with ERRB */ range_table_symbol_to_type (value); return 1; } static int rangetab_data_validate (Lisp_Object UNUSED (keyword), Lisp_Object value, Error_Behavior UNUSED (errb)) { /* #### should deal with ERRB */ EXTERNAL_PROPERTY_LIST_LOOP_3 (range, data, value) { if (!INTP (range) && !CHARP (range) && !(CONSP (range) && CONSP (XCDR (range)) && NILP (XCDR (XCDR (range))) && (INTP (XCAR (range)) || CHARP (XCAR (range))) && (INTP (XCAR (XCDR (range))) || CHARP (XCAR (XCDR (range)))))) sferror ("Invalid range format", range); } return 1; } static Lisp_Object rangetab_instantiate (Lisp_Object plist) { Lisp_Object data = Qnil, type = Qnil, rangetab; PROPERTY_LIST_LOOP_3 (key, value, plist) { if (EQ (key, Qtype)) type = value; else if (EQ (key, Qdata)) data = value; else ABORT (); } rangetab = Fmake_range_table (type); { PROPERTY_LIST_LOOP_3 (range, val, data) { if (CONSP (range)) Fput_range_table (Fcar (range), Fcar (Fcdr (range)), val, rangetab); else Fput_range_table (range, range, val, rangetab); } } return rangetab; } /************************************************************************/ /* Unified range tables */ /************************************************************************/ /* A "unified range table" is a format for storing range tables as contiguous blocks of memory. This is used by the regexp code, which needs to use range tables to properly handle [] constructs in the presence of extended characters but wants to store an entire compiled pattern as a contiguous block of memory. Unified range tables are designed so that they can be placed at an arbitrary (possibly mis-aligned) place in memory. (Dealing with alignment is a pain in the ass.) WARNING: No provisions for garbage collection are currently made. This means that there must not be any Lisp objects in a unified range table that need to be marked for garbage collection. Good candidates for objects that can go into a range table are -- numbers and characters (do not need to be marked) -- nil, t (marked elsewhere) -- charsets and coding systems (automatically marked because they are in a marked list, and can't be removed) Good but slightly less so: -- symbols (could be uninterned, but that is not likely) Somewhat less good: -- buffers, frames, devices (could get deleted) It is expected that you work with range tables in the normal format and then convert to unified format when you are done making modifications. As such, no functions are provided for modifying a unified range table. The only operations you can do to unified range tables are -- look up a value -- retrieve all the ranges in an iterative fashion */ /* The format of a unified range table is as follows: -- The first byte contains the number of bytes to skip to find the actual start of the table. This deals with alignment constraints, since the table might want to go at any arbitrary place in memory. -- The next three bytes contain the number of bytes to skip (from the *first* byte) to find the stuff after the table. It's stored in little-endian format because that's how God intended things. We don't necessarily start the stuff at the very end of the table because we want to have at least ALIGNOF (EMACS_INT) extra space in case we have to move the range table around. (It appears that some architectures don't maintain alignment when reallocing.) -- At the prescribed offset is a struct unified_range_table, containing some number of `struct range_table_entry' entries. */ struct unified_range_table { int nentries; enum range_table_type type; struct range_table_entry first; }; /* Return size in bytes needed to store the data in a range table. */ int unified_range_table_bytes_needed (Lisp_Object rangetab) { return (sizeof (struct range_table_entry) * (Dynarr_length (XRANGE_TABLE (rangetab)->entries) - 1) + sizeof (struct unified_range_table) + /* ALIGNOF a struct may be too big. */ /* We have four bytes for the size numbers, and an extra four or eight bytes for making sure we get the alignment OK. */ ALIGNOF (EMACS_INT) + 4); } /* Convert a range table into unified format and store in DEST, which must be able to hold the number of bytes returned by range_table_bytes_needed(). */ void unified_range_table_copy_data (Lisp_Object rangetab, void *dest) { /* We cast to the above structure rather than just casting to char * and adding sizeof(int), because that will lead to mis-aligned data on the Alpha machines. */ struct unified_range_table *un; range_table_entry_dynarr *rted = XRANGE_TABLE (rangetab)->entries; int total_needed = unified_range_table_bytes_needed (rangetab); void *new_dest = ALIGN_PTR ((char *) dest + 4, EMACS_INT); * (char *) dest = (char) ((char *) new_dest - (char *) dest); * ((unsigned char *) dest + 1) = total_needed & 0xFF; total_needed >>= 8; * ((unsigned char *) dest + 2) = total_needed & 0xFF; total_needed >>= 8; * ((unsigned char *) dest + 3) = total_needed & 0xFF; un = (struct unified_range_table *) new_dest; un->nentries = Dynarr_length (rted); un->type = XRANGE_TABLE (rangetab)->type; memcpy (&un->first, Dynarr_begin (rted), sizeof (struct range_table_entry) * Dynarr_length (rted)); } /* Return number of bytes actually used by a unified range table. */ int unified_range_table_bytes_used (void *unrangetab) { return ((* ((unsigned char *) unrangetab + 1)) + ((* ((unsigned char *) unrangetab + 2)) << 8) + ((* ((unsigned char *) unrangetab + 3)) << 16)); } /* Make sure the table is aligned, and move it around if it's not. */ static void align_the_damn_table (void *unrangetab) { void *cur_dest = (char *) unrangetab + * (char *) unrangetab; if (cur_dest != ALIGN_PTR (cur_dest, EMACS_INT)) { int count = (unified_range_table_bytes_used (unrangetab) - 4 - ALIGNOF (EMACS_INT)); /* Find the proper location, just like above. */ void *new_dest = ALIGN_PTR ((char *) unrangetab + 4, EMACS_INT); /* memmove() works in the presence of overlapping data. */ memmove (new_dest, cur_dest, count); * (char *) unrangetab = (char) ((char *) new_dest - (char *) unrangetab); } } /* Look up a value in a unified range table. */ Lisp_Object unified_range_table_lookup (void *unrangetab, EMACS_INT pos, Lisp_Object default_) { void *new_dest; struct unified_range_table *un; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; return get_range_table (pos, un->nentries, &un->first, default_); } /* Return number of entries in a unified range table. */ int unified_range_table_nentries (void *unrangetab) { void *new_dest; struct unified_range_table *un; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; return un->nentries; } /* Return the OFFSETth range (counting from 0) in UNRANGETAB. */ void unified_range_table_get_range (void *unrangetab, int offset, EMACS_INT *min, EMACS_INT *max, Lisp_Object *val) { void *new_dest; struct unified_range_table *un; struct range_table_entry *tab; align_the_damn_table (unrangetab); new_dest = (char *) unrangetab + * (char *) unrangetab; un = (struct unified_range_table *) new_dest; assert (offset >= 0 && offset < un->nentries); tab = (&un->first) + offset; *min = tab->first; *max = tab->last; *val = tab->val; internal_to_external_adjust_ends (un->type, min, max); } /************************************************************************/ /* Initialization */ /************************************************************************/ void syms_of_rangetab (void) { INIT_LISP_OBJECT (range_table); DEFSYMBOL_MULTIWORD_PREDICATE (Qrange_tablep); DEFSYMBOL (Qrange_table); DEFSYMBOL (Qstart_closed_end_open); DEFSYMBOL (Qstart_open_end_open); DEFSYMBOL (Qstart_closed_end_closed); DEFSYMBOL (Qstart_open_end_closed); DEFSUBR (Frange_table_p); DEFSUBR (Frange_table_type); DEFSUBR (Fmake_range_table); DEFSUBR (Fcopy_range_table); DEFSUBR (Fget_range_table); DEFSUBR (Fput_range_table); DEFSUBR (Fremove_range_table); DEFSUBR (Fclear_range_table); DEFSUBR (Fmap_range_table); } void structure_type_create_rangetab (void) { struct structure_type *st; st = define_structure_type (Qrange_table, 0, rangetab_instantiate); define_structure_type_keyword (st, Qdata, rangetab_data_validate); define_structure_type_keyword (st, Qtype, rangetab_type_validate); }