Mercurial > hg > xemacs-beta
annotate src/casetab.c @ 2720:6fa9919a9a0b
[xemacs-hg @ 2005-04-08 23:10:01 by crestani]
ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add `--enable-mc-alloc' as
a new configure flag.
* configure.in (AC_INIT_PARSE_ARGS): Add `--mc-alloc' as a new
configure flag.
* configure.usage: Add description for `mc-alloc'.
DUMP_IN_EXEC:
* Makefile.in.in: Condition the installation of a separate dump
file on !DUMP_ON_EXEC.
* configure.ac (XE_COMPLEX_ARG_ENABLE): Add
`--enable-dump-in-exec' as a new configure flag.
* configure.ac: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.in (AC_INIT_PARSE_ARGS): Add `--dump-in-exec' as a
new configure flag.
* configure.in: DUMP_IN_EXEC is define as default for PDUMP but
not default for MC_ALLOC.
* configure.usage: Add description for `dump-in-exec'.
lib-src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
DUMP_IN_EXEC:
* Makefile.in.in: Only compile insert-data-in-exec if
DUMP_IN_EXEC is defined.
lisp/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
MEMORY_USAGE_STATS
* diagnose.el: Add new lisp function to pretty print statistics
about the new allocator.
* diagnose.el (show-mc-alloc-memory-usage): New.
modules/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
Remove Lcrecords:
* postgresql/postgresql.c (allocate_pgconn): Allocate with new
allocator.
* postgresql/postgresql.c (allocate_pgresult): Allocate PGresult
with new allocator.
* postgresql/postgresql.h (struct Lisp_PGconn): Add
lrecord_header.
* postgresql/postgresql.h (struct Lisp_PGresult): Add
lrecord_header.
* ldap/eldap.c (allocate_ldap): Allocate with new allocator.
* ldap/eldap.h (struct Lisp_LDAP): Add lrecord_header.
nt/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.inc.samp: Add new flag `MC_ALLOC'.
* xemacs.mak: Add flag and configuration output for `MC_ALLOC'.
New files:
* xemacs.dsp: Add source files mc-alloc.c and mc-alloc.h.
* xemacs.mak: Add new object file mc-alloc.obj to dependencies.
src/ChangeLog addition:
2005-04-01 Marcus Crestani <crestani@xemacs.org>
The new allocator.
New configure flag: `MC_ALLOC':
* config.h.in: Add new flag `MC_ALLOC'.
New files:
* Makefile.in.in: Add new object file mc-alloc.o.
* depend: Add new files to dependencies.
* mc-alloc.c: New.
* mc-alloc.h: New.
Running the new allocator from XEmacs:
* alloc.c (deadbeef_memory): Moved to mc-alloc.c.
* emacs.c (main_1): Initialize the new allocator and add
syms_of_mc_alloc.
* symsinit.h: Add syms_of_mc_alloc.
New lrecord allocation and free functions:
* alloc.c (alloc_lrecord): New. Allocates an lrecord, includes
type checking and initializing of the lrecord_header.
* alloc.c (noseeum_alloc_lrecord): Same as above, but increments
the NOSEEUM cons counter.
* alloc.c (free_lrecord): New. Calls the finalizer and frees the
lrecord.
* lrecord.h: Add lrecord allocation prototypes and comments.
Remove old lrecord FROB block allocation:
* alloc.c (allocate_lisp_storage): Former function to expand
heap. Not needed anymore, remove.
* alloc.c: Completely remove `Fixed-size type macros'
* alloc.c (release_breathing_space): Remove.
* alloc.c (memory_full): Remove release_breathing_space.
* alloc.c (refill_memory_reserve): Remove.
* alloc.c (TYPE_ALLOC_SIZE): Remove.
* alloc.c (DECLARE_FIXED_TYPE_ALLOC): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_FROM_BLOCK): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE_1): Remove.
* alloc.c (ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (NOSEEUM_ALLOCATE_FIXED_TYPE): Remove.
* alloc.c (struct Lisp_Free): Remove.
* alloc.c (LRECORD_FREE_P): Remove.
* alloc.c (MARK_LRECORD_AS_FREE): Remove.
* alloc.c (MARK_LRECORD_AS_NOT_FREE): Remove.
* alloc.c (PUT_FIXED_TYPE_ON_FREE_LIST): Remove.
* alloc.c (FREE_FIXED_TYPE): Remove.
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC): Remove.
Allocate old lrecords with new allocator:
* alloc.c: DECLARE_FIXED_TYPE_ALLOC removed for all lrecords
defined in alloc.c.
* alloc.c (Fcons): Allocate with new allocator.
* alloc.c (noseeum_cons): Allocate with new allocator.
* alloc.c (make_float): Allocate with new allocator.
* alloc.c (make_bignum): Allocate with new allocator.
* alloc.c (make_bignum_bg): Allocate with new allocator.
* alloc.c (make_ratio): Allocate with new allocator.
* alloc.c (make_ratio_bg): Allocate with new allocator.
* alloc.c (make_ratio_rt): Allocate with new allocator.
* alloc.c (make_bigfloat): Allocate with new allocator.
* alloc.c (make_bigfloat_bf): Allocate with new allocator.
* alloc.c (make_compiled_function): Allocate with new allocator.
* alloc.c (Fmake_symbol): Allocate with new allocator.
* alloc.c (allocate_extent): Allocate with new allocator.
* alloc.c (allocate_event): Allocate with new allocator.
* alloc.c (make_key_data): Allocate with new allocator.
* alloc.c (make_button_data): Allocate with new allocator.
* alloc.c (make_motion_data): Allocate with new allocator.
* alloc.c (make_process_data): Allocate with new allocator.
* alloc.c (make_timeout_data): Allocate with new allocator.
* alloc.c (make_magic_data): Allocate with new allocator.
* alloc.c (make_magic_eval_data): Allocate with new allocator.
* alloc.c (make_eval_data): Allocate with new allocator.
* alloc.c (make_misc_user_data): Allocate with new allocator.
* alloc.c (Fmake_marker): Allocate with new allocator.
* alloc.c (noseeum_make_marker): Allocate with new allocator.
* alloc.c (make_uninit_string): Allocate with new allocator.
* alloc.c (resize_string): Allocate with new allocator.
* alloc.c (make_string_nocopy): Allocate with new allocator.
Garbage Collection:
* alloc.c (GC_CHECK_NOT_FREE): Remove obsolete assertions.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK): Remove.
* alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): Remove.
* alloc.c (sweep_conses): Remove.
* alloc.c (free_cons): Use new allocator to free.
* alloc.c (sweep_compiled_functions): Remove.
* alloc.c (sweep_floats): Remove.
* alloc.c (sweep_bignums): Remove.
* alloc.c (sweep_ratios): Remove.
* alloc.c (sweep_bigfloats): Remove.
* alloc.c (sweep_symbols): Remove.
* alloc.c (sweep_extents): Remove.
* alloc.c (sweep_events): Remove.
* alloc.c (sweep_key_data): Remove.
* alloc.c (free_key_data): Use new allocator to free.
* alloc.c (sweep_button_data): Remove.
* alloc.c (free_button_data): Use new allocator to free.
* alloc.c (sweep_motion_data): Remove.
* alloc.c (free_motion_data): Use new allocator to free.
* alloc.c (sweep_process_data): Remove.
* alloc.c (free_process_data): Use new allocator to free.
* alloc.c (sweep_timeout_data): Remove.
* alloc.c (free_timeout_data): Use new allocator to free.
* alloc.c (sweep_magic_data): Remove.
* alloc.c (free_magic_data): Use new allocator to free.
* alloc.c (sweep_magic_eval_data): Remove.
* alloc.c (free_magic_eval_data): Use new allocator to free.
* alloc.c (sweep_eval_data): Remove.
* alloc.c (free_eval_data): Use new allocator to free.
* alloc.c (sweep_misc_user_data): Remove.
* alloc.c (free_misc_user_data): Use new allocator to free.
* alloc.c (sweep_markers): Remove.
* alloc.c (free_marker): Use new allocator to free.
* alloc.c (garbage_collect_1): Remove release_breathing_space.
* alloc.c (gc_sweep): Remove all the old lcrecord and lrecord
related stuff. Sweeping now works like this: compact string
chars, finalize, sweep.
* alloc.c (common_init_alloc_early): Remove old lrecord
initializations, remove breathing_space.
* emacs.c (Fdump_emacs): Remove release_breathing_space.
* lisp.h: Remove prototype for release_breathing_space.
* lisp.h: Adjust the special cons mark makros.
Lrecord Finalizer:
* alloc.c: Add finalizer to lrecord definition.
* alloc.c (finalize_string): Add finalizer for string.
* bytecode.c: Add finalizer to lrecord definition.
* bytecode.c (finalize_compiled_function): Add finalizer for
compiled function.
* marker.c: Add finalizer to lrecord definition.
* marker.c (finalize_marker): Add finalizer for marker.
These changes build the interface to mc-alloc:
* lrecord.h (MC_ALLOC_CALL_FINALIZER): Tell mc-alloc how to
finalize lrecords.
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): Tell
mc-alloc how to finalize for disksave.
Unify lrecords and lcrecords:
* lisp.h (struct Lisp_String): Adjust string union hack to
new lrecord header.
* lrecord.h: Adjust comments.
* lrecord.h (struct lrecord_header): The new lrecord header
includes type, lisp-readonly, free, and uid.
* lrecord.h (set_lheader_implementation): Adjust to new
lrecord_header.
* lrecord.h (struct lrecord_implementation): The field basic_p
for indication of an old lrecord is not needed anymore, remove.
* lrecord.h (MAKE_LRECORD_IMPLEMENTATION): Remove basic_p.
* lrecord.h (MAKE_EXTERNAL_LRECORD_IMPLEMENTATION): Remove
basic_p.
* lrecord.h (copy_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (copy_lrecord): Remove distinction between old
lrecords and lcrecords.
* lrecord.h (zero_sized_lrecord): Remove distinction between
old lrecords and lcrecords.
* lrecord.h (zero_lrecord): Remove distinction between old
lrecords and lcrecords.
Remove lcrecords and lcrecord lists:
* alloc.c (basic_alloc_lcrecord): Not needed anymore, remove.
* alloc.c (very_old_free_lcrecord): Not needed anymore, remove.
* alloc.c (copy_lisp_object): No more distinction between
lrecords and lcrecords.
* alloc.c (all_lcrecords): Not needed anymore, remove.
* alloc.c (make_vector_internal): Allocate as lrecord.
* alloc.c (make_bit_vector_internal): Allocate as lrecord.
* alloc.c: Completely remove `lcrecord lists'.
* alloc.c (free_description): Remove.
* alloc.c (lcrecord_list_description): Remove.
* alloc.c (mark_lcrecord_list): Remove.
* alloc.c (make_lcrecord_list): Remove.
* alloc.c (alloc_managed_lcrecord): Remove.
* alloc.c (free_managed_lcrecord): Remove.
* alloc.c (alloc_automanaged_lcrecord): Remove.
* alloc.c (free_lcrecord): Remove.
* alloc.c (lcrecord_stats): Remove.
* alloc.c (tick_lcrecord_stats): Remove.
* alloc.c (disksave_object_finalization_1): Add call to
mc_finalize_for_disksave. Remove the lcrecord way to visit all
objects.
* alloc.c (kkcc_marking): Remove XD_FLAG_FREE_LISP_OBJECT
* alloc.c (sweep_lcrecords_1): Remove.
* alloc.c (common_init_alloc_early): Remove everything related
to lcrecords, remove old lrecord initializations,
* alloc.c (init_lcrecord_lists): Not needed anymore, remove.
* alloc.c (reinit_alloc_early): Remove everything related to
lcrecords.
* alloc.c (init_alloc_once_early): Remove everything related to
lcrecords.
* buffer.c (allocate_buffer): Allocate as lrecord.
* buffer.c (nuke_all_buffer_slots): Use lrecord functions.
* buffer.c (common_init_complex_vars_of_buffer): Allocate as
lrecord.
* buffer.h (struct buffer): Add lrecord_header.
* casetab.c (allocate_case_table): Allocate as lrecord.
* casetab.h (struct Lisp_Case_Table): Add lrecord_header.
* charset.h (struct Lisp_Charset): Add lrecord_header.
* chartab.c (fill_char_table): Use lrecord functions.
* chartab.c (Fmake_char_table): Allocate as lrecord.
* chartab.c (make_char_table_entry): Allocate as lrecord.
* chartab.c (copy_char_table_entry): Allocate as lrecord.
* chartab.c (Fcopy_char_table): Allocate as lrecord.
* chartab.c (put_char_table): Use lrecord functions.
* chartab.h (struct Lisp_Char_Table_Entry): Add lrecord_header.
* chartab.h (struct Lisp_Char_Table): Add lrecord_header.
* console-impl.h (struct console): Add lrecord_header.
* console-msw-impl.h (struct Lisp_Devmode): Add lrecord_header.
* console-msw-impl.h (struct mswindows_dialog_id): Add
lrecord_header.
* console.c (allocate_console): Allocate as lrecord.
* console.c (nuke_all_console_slots): Use lrecord functions.
* console.c (common_init_complex_vars_of_console): Allocate as
lrecord.
* data.c (make_weak_list): Allocate as lrecord.
* data.c (make_weak_box): Allocate as lrecord.
* data.c (make_ephemeron): Allocate as lrecord.
* database.c (struct Lisp_Database): Add lrecord_header.
* database.c (allocate_database): Allocate as lrecord.
* device-impl.h (struct device): Add lrecord_header.
* device-msw.c (allocate_devmode): Allocate as lrecord.
* device.c (nuke_all_device_slots): Use lrecord functions.
* device.c (allocate_device): Allocate as lrecord.
* dialog-msw.c (handle_question_dialog_box): Allocate as lrecord.
* elhash.c (struct Lisp_Hash_Table): Add lrecord_header.
* elhash.c (make_general_lisp_hash_table): Allocate as lrecord.
* elhash.c (Fcopy_hash_table): Allocate as lrecord.
* event-stream.c: Lcrecord lists Vcommand_builder_free_list and
Vtimeout_free_list are no longer needed. Remove.
* event-stream.c (allocate_command_builder): Allocate as lrecord.
* event-stream.c (free_command_builder): Use lrecord functions.
* event-stream.c (event_stream_generate_wakeup): Allocate as
lrecord.
* event-stream.c (event_stream_resignal_wakeup): Use lrecord
functions.
* event-stream.c (event_stream_disable_wakeup): Use lrecord
functions.
* event-stream.c (reinit_vars_of_event_stream): Lcrecord lists
remove.
* events.h (struct Lisp_Timeout): Add lrecord_header.
* events.h (struct command_builder): Add lrecord_header.
* extents-impl.h (struct extent_auxiliary): Add lrecord_header.
* extents-impl.h (struct extent_info): Add lrecord_header.
* extents.c (allocate_extent_auxiliary): Allocate as lrecord.
* extents.c (allocate_extent_info): Allocate as lrecord.
* extents.c (copy_extent): Allocate as lrecord.
* faces.c (allocate_face): Allocate as lrecord.
* faces.h (struct Lisp_Face): Add lrecord_header.
* file-coding.c (allocate_coding_system): Allocate as lrecord.
* file-coding.c (Fcopy_coding_system): Allocate as lrecord.
* file-coding.h (struct Lisp_Coding_System): Add lrecord_header.
* fns.c (Ffillarray): Allocate as lrecord.
* frame-impl.h (struct frame): Add lrecord_header.
* frame.c (nuke_all_frame_slots): Use lrecord functions.
* frame.c (allocate_frame_core): Allocate as lrecord.
* glyphs.c (allocate_image_instance): Allocate as lrecord.
* glyphs.c (Fcolorize_image_instance): Allocate as lrecord.
* glyphs.c (allocate_glyph): Allocate as lrecord.
* glyphs.h (struct Lisp_Image_Instance): Add lrecord_header.
* glyphs.h (struct Lisp_Glyph): Add lrecord_header.
* gui.c (allocate_gui_item): Allocate as lrecord.
* gui.h (struct Lisp_Gui_Item): Add lrecord_header.
* keymap.c (struct Lisp_Keymap): Add lrecord_header.
* keymap.c (make_keymap): Allocate as lrecord.
* lisp.h (struct Lisp_Vector): Add lrecord_header.
* lisp.h (struct Lisp_Bit_Vector): Add lrecord_header.
* lisp.h (struct weak_box): Add lrecord_header.
* lisp.h (struct ephemeron): Add lrecord_header.
* lisp.h (struct weak_list): Add lrecord_header.
* lrecord.h (struct lcrecord_header): Not used, remove.
* lrecord.h (struct free_lcrecord_header): Not used, remove.
* lrecord.h (struct lcrecord_list): Not needed anymore, remove.
* lrecord.h (lcrecord_list): Not needed anymore, remove.
* lrecord.h: (enum data_description_entry_flags): Remove
XD_FLAG_FREE_LISP_OBJECT.
* lstream.c: Lrecord list Vlstream_free_list remove.
* lstream.c (Lstream_new): Allocate as lrecord.
* lstream.c (Lstream_delete): Use lrecod functions.
* lstream.c (reinit_vars_of_lstream): Vlstream_free_list
initialization remove.
* lstream.h (struct lstream): Add lrecord_header.
* emacs.c (main_1): Remove lstream initialization.
* mule-charset.c (make_charset): Allocate as lrecord.
* objects-impl.h (struct Lisp_Color_Instance): Add
lrecord_header.
* objects-impl.h (struct Lisp_Font_Instance): Add lrecord_header.
* objects.c (Fmake_color_instance): Allocate as lrecord.
* objects.c (Fmake_font_instance): Allocate as lrecord.
* objects.c (reinit_vars_of_objects): Allocate as lrecord.
* opaque.c: Lcreord list Vopaque_ptr_list remove.
* opaque.c (make_opaque): Allocate as lrecord.
* opaque.c (make_opaque_ptr): Allocate as lrecord.
* opaque.c (free_opaque_ptr): Use lrecord functions.
* opaque.c (reinit_opaque_early):
* opaque.c (init_opaque_once_early): Vopaque_ptr_list
initialization remove.
* opaque.h (Lisp_Opaque): Add lrecord_header.
* opaque.h (Lisp_Opaque_Ptr): Add lrecord_header.
* emacs.c (main_1): Remove opaque variable initialization.
* print.c (default_object_printer): Use new lrecord_header.
* print.c (print_internal): Use new lrecord_header.
* print.c (debug_p4): Use new lrecord_header.
* process.c (make_process_internal): Allocate as lrecord.
* procimpl.h (struct Lisp_Process): Add lrecord_header.
* rangetab.c (Fmake_range_table): Allocate as lrecord.
* rangetab.c (Fcopy_range_table): Allocate as lrecord.
* rangetab.h (struct Lisp_Range_Table): Add lrecord_header.
* scrollbar.c (create_scrollbar_instance): Allocate as lrecord.
* scrollbar.h (struct scrollbar_instance): Add lrecord_header.
* specifier.c (make_specifier_internal): Allocate as lrecord.
* specifier.h (struct Lisp_Specifier): Add lrecord_header.
* symbols.c:
* symbols.c (Fmake_variable_buffer_local): Allocate as lrecord.
* symbols.c (Fdontusethis_set_symbol_value_handler): Allocate
as lrecord.
* symbols.c (Fdefvaralias): Allocate as lrecord.
* symeval.h (struct symbol_value_magic): Add lrecord_header.
* toolbar.c (update_toolbar_button): Allocate as lrecord.
* toolbar.h (struct toolbar_button): Add lrecord_header.
* tooltalk.c (struct Lisp_Tooltalk_Message): Add lrecord_header.
* tooltalk.c (make_tooltalk_message): Allocate as lrecord.
* tooltalk.c (struct Lisp_Tooltalk_Pattern): Add lrecord_header.
* tooltalk.c (make_tooltalk_pattern): Allocate as lrecord.
* ui-gtk.c (allocate_ffi_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_object_data): Allocate as lrecord.
* ui-gtk.c (allocate_emacs_gtk_boxed_data): Allocate as lrecord.
* ui-gtk.h (structs): Add lrecord_header.
* window-impl.h (struct window): Add lrecord_header.
* window-impl.h (struct window_mirror): Add lrecord_header.
* window.c (allocate_window): Allocate as lrecord.
* window.c (new_window_mirror): Allocate as lrecord.
* window.c (make_dummy_parent): Allocate as lrecord.
MEMORY_USAGE_STATS
* alloc.c (fixed_type_block_overhead): Not used anymore, remove.
* buffer.c (compute_buffer_usage): Get storage size from new
allocator.
* marker.c (compute_buffer_marker_usage): Get storage size from
new allocator.
* mule-charset.c (compute_charset_usage): Get storage size from
new allocator.
* scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage):
Get storage size from new allocator.
* scrollbar-x.c (x_compute_scrollbar_instance_usage): Get
storage size from new allocator.
* scrollbar.c (compute_scrollbar_instance_usage): Get storage
size from new allocator.
* unicode.c (compute_from_unicode_table_size_1): Get storage
size from new allocator.
* unicode.c (compute_to_unicode_table_size_1): Get storage size
from new allocator.
* window.c (compute_window_mirror_usage): Get storage size from
new allocator.
* window.c (compute_window_usage): Get storage size from new
allocator.
MC_ALLOC_TYPE_STATS:
* alloc.c (alloc_lrecord): Bump lrecord count.
* alloc.c (noseeum_alloc_lrecord): Bump lrecord count.
* alloc.c (struct lrecord_stats): Storage for counts.
* alloc.c (init_lrecord_stats): Zero statistics.
* alloc.c (inc_lrecord_stats): Increase the statistic.
* alloc.c (dec_lrecord_stats): Decrease the statistic.
* alloc.c (gc_plist_hack): Used to print the information.
* alloc.c (Fgarbage_collect): Return the collected information.
* mc-alloc.c (remove_cell): Decrease lrecord count.
* mc-alloc.h: Set flag MC_ALLOC_TYPE_STATS.
* emacs.c (main_1): Init lrecord statistics.
* lrecord.h: Add prototypes for *_lrecord_stats.
Strings:
* alloc.c (Fmake_string): Initialize ascii_begin to zero.
* alloc.c (gc_count_num_short_string_in_use): Remove.
* alloc.c (gc_count_string_total_size): Remove.
* alloc.c (gc_count_short_string_total_size): Remove.
* alloc.c (debug_string_purity): Remove.
* alloc.c (debug_string_purity_print): Remove.
* alloc.c (sweep_strings): Remove.
Remove static C-readonly Lisp objects:
* alloc.c (c_readonly): Not needed anymore, remove.
* alloc.c (GC_CHECK_LHEADER_INVARIANTS): Remove some obsolete
lheader invariants assertions.
* buffer.c (DEFVAR_BUFFER_LOCAL_1): Allocate dynamically.
* console.c (DEFVAR_CONSOLE_LOCAL_1): Allocate dynamically.
* gpmevent.c: Indirection via MC_ALLOC_Freceive_gpm_event.
* gpmevent.c (Fgpm_enable): Allocate dynamically.
* gpmevent.c (syms_of_gpmevent): Allocate dynamically.
* lisp.h (C_READONLY): Not needed anymore, remove.
* lisp.h (DEFUN): Allocate dynamically.
* lrecord.h (C_READONLY_RECORD_HEADER_P): Not needed anymore,
remove.
* lrecord.h (SET_C_READONLY_RECORD_HEADER): Not needed anymore,
remove.
* symbols.c (guts_of_unbound_marker):
* symeval.h (defsubr): Allocate dynamically.
* symeval.h (DEFSUBR_MACRO): Allocate dynamically.
* symeval.h (DEFVAR_ SYMVAL_FWD): Allocate dynamically.
* tests.c (TESTS_DEFSUBR): Allocate dynamically.
Definition of mcpro:
* lisp.h: Add mcpro prototypes.
* alloc.c (common_init_alloc_early): Add initialization for
mcpros.
* alloc.c (mcpro_description_1): New.
* alloc.c (mcpro_description): New.
* alloc.c (mcpros_description_1): New.
* alloc.c (mcpros_description): New.
* alloc.c (mcpro_one_name_description_1): New.
* alloc.c (mcpro_one_name_description): New.
* alloc.c (mcpro_names_description_1): New.
* alloc.c (mcpro_names_description): New.
* alloc.c (mcpros): New.
* alloc.c (mcpro_names): New.
* alloc.c (mcpro_1): New.
* alloc.c (mc_pro): New.
* alloc.c (garbage_collect_1): Add mcpros to root set.
Usage of mcpro:
* alloc.c (make_string_nocopy): Add string to root set.
* symbols.c (init_symbols_once_early): Add Qunbound to root set.
Changes to the Portable Dumper:
* alloc.c (FREE_OR_REALLOC_BEGIN): Since dumped objects can be
freed with the new allocator, remove assertion for !DUMPEDP.
* dumper.c: Adjust comments, increase PDUMP_HASHSIZE.
* dumper.c (pdump_make_hash): Shift address only 2 bytes, to
avoid collisions.
* dumper.c (pdump_objects_unmark): No more mark bits within
the object, remove.
* dumper.c (mc_addr_elt): New. Element data structure for mc
hash table.
* dumper.c (pdump_mc_hash): New hash table: `lookup table'.
* dumper.c (pdump_get_mc_addr): New. Lookup for hash table.
* dumper.c (pdump_get_indirect_mc_addr): New. Lookup for
convertibles.
* dumper.c (pdump_put_mc_addr): New. Putter for hash table.
* dumper.c (pdump_dump_mc_data): New. Writes the table for
relocation at load time to the dump file.
* dumper.c (pdump_scan_lisp_objects_by_alignment): New.
Visits all dumped Lisp objects.
* dumper.c (pdump_scan_non_lisp_objects_by_alignment): New.
Visits all other dumped objects.
* dumper.c (pdump_reloc_one_mc): New. Updates all pointers
of an object by using the hash table pdump_mc_hash.
* dumper.c (pdump_reloc_one): Replaced by pdump_reloc_one_mc.
* dumper.c (pdump): Change the structure of the dump file, add
the mc post dump relocation table to dump file.
* dumper.c (pdump_load_finish): Hand all dumped objects to the
new allocator and use the mc post dump relocation table for
relocating the dumped objects at dump file load time, free not
longer used data structures.
* dumper.c (pdump_load): Free the dump file.
* dumper.h: Remove pdump_objects_unmark.
* lrecord.h (DUMPEDP): Dumped objects can be freed, remove.
DUMP_IN_EXEC:
* Makefile.in.in: Linking for and with dump in executable only if
DUMP_IN_EXEC is defined.
* config.h.in: Add new flag `DUMP_IN_EXEC'
* emacs.c: Condition dump-data.h on DUMP_IN_EXEC.
* emacs.c (main_1): Flag `-si' only works if dump image is
written into executable.
Miscellanious
* lrecord.h (enum lrecord_type): Added numbers to all types,
very handy for debugging.
* xemacs.def.in.in: Add mc-alloc functions to make them visible
to the modules.
| author | crestani |
|---|---|
| date | Fri, 08 Apr 2005 23:11:35 +0000 |
| parents | 04bc9d2f42c7 |
| children | 1e7cc382eb16 |
| rev | line source |
|---|---|
| 428 | 1 /* XEmacs routines to deal with case tables. |
| 2 Copyright (C) 1987, 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 793 | 4 Copyright (C) 2002 Ben Wing. |
| 428 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 771 | 23 /* Synched up with: FSF 19.28. Between FSF 19.28 and 19.30, casetab.c |
| 428 | 24 was rewritten to use junky FSF char tables. Meanwhile I rewrote it |
| 771 | 25 to use more logical char tables. --ben */ |
| 428 | 26 |
| 826 | 27 /* Written by Howard Gayle. */ |
| 428 | 28 |
| 29 /* Modified for Mule by Ben Wing. */ | |
| 30 | |
| 826 | 31 /* The four tables in a case table are downcase, upcase, canon, and eqv. |
| 32 Each is a char-table. Their workings are rather non-obvious. | |
| 33 | |
| 34 (1) `downcase' is the only obvious table: Map a character to its | |
| 35 lowercase equivalent. | |
| 771 | 36 |
| 826 | 37 (2) `upcase' does *NOT* map a character to its uppercase equivalent, |
| 38 despite its name. Rather, it maps lowercase characters to their | |
| 39 uppercase equivalent, and uppercase characters to *ANYTHING BUT* their | |
| 40 uppercase equivalent (currently, their lowercase equivalent), and | |
| 41 characters without case to themselves. It is used to determine if a | |
| 42 character "has no case" (no uppercase or lowercase mapping). #### This | |
| 43 is way bogus. Just use the obvious implementation of uppercase mapping | |
| 44 and of NOCASE_P. | |
| 446 | 45 |
| 826 | 46 (3) `canon' maps each character to a "canonical" lowercase, such that if |
| 47 two different uppercase characters map to the same lowercase character, | |
| 48 or vice versa, both characters will have the same entry in the canon | |
| 49 table. | |
| 446 | 50 |
| 826 | 51 (4) `equiv' lists the "equivalence classes" defined by `canon'. Imagine |
| 52 that all characters are divided into groups having the same `canon' | |
| 53 entry; these groups are called "equivalence classes" and `equiv' lists | |
| 54 them by linking the characters in each equivalence class together in a | |
| 55 circular list. | |
| 56 | |
| 57 `canon' is used when doing case-insensitive comparisons. `equiv' is | |
| 58 used in the Boyer-Moore search code. | |
| 59 */ | |
| 428 | 60 |
| 61 #include <config.h> | |
| 62 #include "lisp.h" | |
| 63 #include "buffer.h" | |
| 64 #include "opaque.h" | |
| 446 | 65 #include "chartab.h" |
| 66 #include "casetab.h" | |
| 428 | 67 |
| 446 | 68 Lisp_Object Qcase_tablep, Qdowncase, Qupcase; |
| 69 Lisp_Object Vstandard_case_table; | |
| 428 | 70 |
| 446 | 71 Lisp_Object case_table_char (Lisp_Object ch, Lisp_Object table); |
| 428 | 72 |
| 826 | 73 #define STRING256_P(obj) ((STRINGP (obj) && string_char_length (obj) == 256)) |
| 446 | 74 |
| 75 static Lisp_Object | |
| 76 mark_case_table (Lisp_Object obj) | |
| 77 { | |
| 78 Lisp_Case_Table *ct = XCASE_TABLE (obj); | |
| 79 | |
| 80 mark_object (CASE_TABLE_DOWNCASE (ct)); | |
| 81 mark_object (CASE_TABLE_UPCASE (ct)); | |
| 82 mark_object (CASE_TABLE_CANON (ct)); | |
| 83 mark_object (CASE_TABLE_EQV (ct)); | |
| 84 return Qnil; | |
| 85 } | |
| 86 | |
| 87 static void | |
| 2286 | 88 print_case_table (Lisp_Object obj, Lisp_Object printcharfun, |
| 89 int UNUSED (escapeflag)) | |
| 446 | 90 { |
| 91 Lisp_Case_Table *ct = XCASE_TABLE (obj); | |
| 92 if (print_readably) | |
| 826 | 93 printing_unreadable_object ("#<case-table 0x%x>", ct->header.uid); |
| 94 write_fmt_string_lisp | |
| 95 (printcharfun, "#<case-table downcase=%s upcase=%s canon=%s eqv=%s ", 4, | |
| 96 CASE_TABLE_DOWNCASE (ct), CASE_TABLE_UPCASE (ct), | |
| 97 CASE_TABLE_CANON (ct), CASE_TABLE_EQV (ct)); | |
| 98 write_fmt_string (printcharfun, "0x%x>", ct->header.uid); | |
| 446 | 99 } |
| 100 | |
| 1204 | 101 static const struct memory_description case_table_description [] = { |
| 446 | 102 { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, downcase_table) }, |
| 103 { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, upcase_table) }, | |
| 104 { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, case_canon_table) }, | |
| 105 { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, case_eqv_table) }, | |
| 106 { XD_END } | |
| 107 }; | |
| 108 | |
| 934 | 109 |
| 110 DEFINE_LRECORD_IMPLEMENTATION("case-table", case_table, | |
| 111 1, /*dumpable-flag*/ | |
| 112 mark_case_table, print_case_table, 0, | |
| 113 0, 0, case_table_description, Lisp_Case_Table); | |
| 446 | 114 |
| 115 static Lisp_Object | |
| 826 | 116 allocate_case_table (int init_tables) |
| 446 | 117 { |
| 118 Lisp_Case_Table *ct = | |
| 2720 | 119 #ifdef MC_ALLOC |
| 120 alloc_lrecord_type (Lisp_Case_Table, &lrecord_case_table); | |
| 121 #else /* not MC_ALLOC */ | |
| 446 | 122 alloc_lcrecord_type (Lisp_Case_Table, &lrecord_case_table); |
| 2720 | 123 #endif /* not MC_ALLOC */ |
| 446 | 124 |
| 826 | 125 if (init_tables) |
| 126 { | |
| 127 SET_CASE_TABLE_DOWNCASE (ct, MAKE_TRT_TABLE ()); | |
| 128 SET_CASE_TABLE_UPCASE (ct, MAKE_TRT_TABLE ()); | |
| 129 SET_CASE_TABLE_CANON (ct, MAKE_TRT_TABLE ()); | |
| 130 SET_CASE_TABLE_EQV (ct, MAKE_TRT_TABLE ()); | |
| 131 } | |
| 132 else | |
| 133 { | |
| 134 SET_CASE_TABLE_DOWNCASE (ct, Qnil); | |
| 135 SET_CASE_TABLE_UPCASE (ct, Qnil); | |
| 136 SET_CASE_TABLE_CANON (ct, Qnil); | |
| 137 SET_CASE_TABLE_EQV (ct, Qnil); | |
| 138 } | |
| 139 return wrap_case_table (ct); | |
| 140 } | |
| 446 | 141 |
| 826 | 142 DEFUN ("make-case-table", Fmake_case_table, 0, 0, 0, /* |
| 143 Create a new, empty case table. | |
| 144 */ | |
| 145 ()) | |
| 146 { | |
| 147 return allocate_case_table (1); | |
| 446 | 148 } |
| 428 | 149 |
| 150 DEFUN ("case-table-p", Fcase_table_p, 1, 1, 0, /* | |
| 444 | 151 Return t if OBJECT is a case table. |
| 428 | 152 See `set-case-table' for more information on these data structures. |
| 153 */ | |
| 444 | 154 (object)) |
| 428 | 155 { |
| 446 | 156 if (CASE_TABLEP (object)) |
| 157 return Qt; | |
| 158 else | |
| 159 { | |
| 160 Lisp_Object down, up, canon, eqv; | |
| 161 if (!CONSP (object)) | |
| 162 return Qnil; | |
| 163 down = XCAR (object); object = XCDR (object); | |
| 164 if (!CONSP (object)) | |
| 165 return Qnil; | |
| 166 up = XCAR (object); object = XCDR (object); | |
| 167 if (!CONSP (object)) | |
| 168 return Qnil; | |
| 169 canon = XCAR (object); object = XCDR (object); | |
| 170 if (!CONSP (object)) | |
| 171 return Qnil; | |
| 172 eqv = XCAR (object); | |
| 428 | 173 |
| 446 | 174 return ((STRING256_P (down) |
| 175 && (NILP (up) || STRING256_P (up)) | |
| 176 && ((NILP (canon) && NILP (eqv)) | |
| 177 || STRING256_P (canon)) | |
| 178 && (NILP (eqv) || STRING256_P (eqv))) | |
| 179 ? Qt : Qnil); | |
| 180 | |
| 181 } | |
| 428 | 182 } |
| 183 | |
| 184 static Lisp_Object | |
| 444 | 185 check_case_table (Lisp_Object object) |
| 428 | 186 { |
| 446 | 187 /* This function can GC */ |
| 444 | 188 while (NILP (Fcase_table_p (object))) |
| 189 object = wrong_type_argument (Qcase_tablep, object); | |
| 190 return object; | |
| 428 | 191 } |
| 192 | |
| 446 | 193 Lisp_Object |
| 194 case_table_char (Lisp_Object ch, Lisp_Object table) | |
| 195 { | |
| 196 Lisp_Object ct_char; | |
| 826 | 197 ct_char = get_char_table (XCHAR (ch), table); |
| 446 | 198 if (NILP (ct_char)) |
| 199 return ch; | |
| 200 else | |
| 201 return ct_char; | |
| 202 } | |
| 203 | |
| 204 DEFUN ("get-case-table", Fget_case_table, 3, 3, 0, /* | |
| 205 Return CHAR-CASE version of CHARACTER in CASE-TABLE. | |
| 206 | |
| 826 | 207 CHAR-CASE is either `downcase' or `upcase'. |
| 446 | 208 */ |
| 209 (char_case, character, case_table)) | |
| 210 { | |
| 211 CHECK_CHAR (character); | |
| 212 CHECK_CASE_TABLE (case_table); | |
| 213 if (EQ (char_case, Qdowncase)) | |
| 214 return case_table_char (character, XCASE_TABLE_DOWNCASE (case_table)); | |
| 215 else if (EQ (char_case, Qupcase)) | |
| 216 return case_table_char (character, XCASE_TABLE_UPCASE (case_table)); | |
| 217 else | |
| 563 | 218 invalid_constant ("Char case must be downcase or upcase", char_case); |
| 446 | 219 |
| 220 return Qnil; /* Not reached. */ | |
| 221 } | |
| 222 | |
| 223 DEFUN ("put-case-table", Fput_case_table, 4, 4, 0, /* | |
| 224 Set CHAR-CASE version of CHARACTER to be VALUE in CASE-TABLE. | |
| 225 | |
| 826 | 226 CHAR-CASE is either `downcase' or `upcase'. |
| 446 | 227 See also `put-case-table-pair'. |
| 228 */ | |
| 229 (char_case, character, value, case_table)) | |
| 230 { | |
| 231 CHECK_CHAR (character); | |
| 232 CHECK_CHAR (value); | |
| 233 | |
| 234 if (EQ (char_case, Qdowncase)) | |
| 235 { | |
| 236 Fput_char_table (character, value, XCASE_TABLE_DOWNCASE (case_table)); | |
| 826 | 237 /* This one is not at all intuitive. See comment at top of file. */ |
| 446 | 238 Fput_char_table (character, value, XCASE_TABLE_UPCASE (case_table)); |
| 239 } | |
| 240 else if (EQ (char_case, Qupcase)) | |
| 241 { | |
| 242 Fput_char_table (character, value, XCASE_TABLE_UPCASE (case_table)); | |
| 826 | 243 Fput_char_table (character, character, |
| 244 XCASE_TABLE_DOWNCASE (case_table)); | |
| 446 | 245 } |
| 246 else | |
| 826 | 247 invalid_constant ("CHAR-CASE must be downcase or upcase", char_case); |
| 446 | 248 |
| 826 | 249 XCASE_TABLE (case_table)->dirty = 1; |
| 446 | 250 return Qnil; |
| 251 } | |
| 252 | |
| 253 DEFUN ("put-case-table-pair", Fput_case_table_pair, 3, 3, 0, /* | |
| 254 Make UC and LC a pair of inter-case-converting letters in CASE-TABLE. | |
| 255 UC is an uppercase character and LC is a downcase character. | |
| 256 */ | |
| 257 (uc, lc, case_table)) | |
| 258 { | |
| 259 CHECK_CHAR (uc); | |
| 260 CHECK_CHAR (lc); | |
| 261 CHECK_CASE_TABLE (case_table); | |
| 262 | |
| 263 Fput_char_table (lc, lc, XCASE_TABLE_DOWNCASE (case_table)); | |
| 264 Fput_char_table (uc, lc, XCASE_TABLE_UPCASE (case_table)); | |
| 265 Fput_char_table (uc, lc, XCASE_TABLE_DOWNCASE (case_table)); | |
| 266 Fput_char_table (lc, uc, XCASE_TABLE_UPCASE (case_table)); | |
| 267 | |
| 826 | 268 XCASE_TABLE (case_table)->dirty = 1; |
| 446 | 269 return Qnil; |
| 270 } | |
| 271 | |
| 272 DEFUN ("copy-case-table", Fcopy_case_table, 1, 1, 0, /* | |
| 273 Return a new case table which is a copy of CASE-TABLE | |
| 274 */ | |
| 275 (case_table)) | |
| 276 { | |
| 277 Lisp_Object new_obj; | |
| 278 CHECK_CASE_TABLE (case_table); | |
| 279 | |
| 826 | 280 new_obj = allocate_case_table (0); |
| 446 | 281 XSET_CASE_TABLE_DOWNCASE |
| 282 (new_obj, Fcopy_char_table (XCASE_TABLE_DOWNCASE (case_table))); | |
| 283 XSET_CASE_TABLE_UPCASE | |
| 284 (new_obj, Fcopy_char_table (XCASE_TABLE_UPCASE (case_table))); | |
| 285 XSET_CASE_TABLE_CANON | |
| 286 (new_obj, Fcopy_char_table (XCASE_TABLE_CANON (case_table))); | |
| 287 XSET_CASE_TABLE_EQV | |
| 288 (new_obj, Fcopy_char_table (XCASE_TABLE_EQV (case_table))); | |
| 289 return new_obj; | |
| 290 } | |
| 291 | |
| 826 | 292 static int |
| 293 compute_canon_mapper (struct chartab_range *range, | |
| 2286 | 294 Lisp_Object UNUSED (table), Lisp_Object val, void *arg) |
| 826 | 295 { |
| 296 Lisp_Object casetab = VOID_TO_LISP (arg); | |
| 297 if (range->type == CHARTAB_RANGE_CHAR) | |
| 298 SET_TRT_TABLE_OF (XCASE_TABLE_CANON (casetab), range->ch, | |
| 299 TRT_TABLE_OF (XCASE_TABLE_DOWNCASE (casetab), | |
| 300 TRT_TABLE_OF (XCASE_TABLE_UPCASE (casetab), | |
| 301 XCHAR (val)))); | |
| 302 | |
| 303 return 0; | |
| 304 } | |
| 305 | |
| 306 static int | |
| 307 initialize_identity_mapper (struct chartab_range *range, | |
| 2286 | 308 Lisp_Object UNUSED (table), |
| 309 Lisp_Object UNUSED (val), void *arg) | |
| 826 | 310 { |
| 311 Lisp_Object trt = VOID_TO_LISP (arg); | |
| 312 if (range->type == CHARTAB_RANGE_CHAR) | |
| 313 SET_TRT_TABLE_OF (trt, range->ch, range->ch); | |
| 314 | |
| 315 return 0; | |
| 316 } | |
| 317 | |
| 318 static int | |
| 319 compute_up_or_eqv_mapper (struct chartab_range *range, | |
| 2286 | 320 Lisp_Object UNUSED (table), |
| 321 Lisp_Object val, void *arg) | |
| 826 | 322 { |
| 323 Lisp_Object inverse = VOID_TO_LISP (arg); | |
| 867 | 324 Ichar toch = XCHAR (val); |
| 826 | 325 |
| 326 if (range->type == CHARTAB_RANGE_CHAR && range->ch != toch) | |
| 327 { | |
| 867 | 328 Ichar c = TRT_TABLE_OF (inverse, toch); |
| 826 | 329 SET_TRT_TABLE_OF (inverse, toch, range->ch); |
| 330 SET_TRT_TABLE_OF (inverse, range->ch, c); | |
| 331 } | |
| 332 | |
| 333 return 0; | |
| 334 } | |
| 335 | |
| 336 /* Recomputing the canonical and equivalency tables from scratch is a | |
| 337 lengthy process, and doing them incrementally is extremely difficult or | |
| 338 perhaps impossible -- and certainly not worth it. To avoid lots of | |
| 339 excessive recomputation when lots of stuff is incrementally added, we | |
| 340 just store a dirty flag and then recompute when a value from the canon | |
| 341 or eqv tables is actually needed. */ | |
| 342 | |
| 343 void | |
| 344 recompute_case_table (Lisp_Object casetab) | |
| 345 { | |
| 346 struct chartab_range range; | |
| 347 | |
| 348 range.type = CHARTAB_RANGE_ALL; | |
| 349 /* Turn off dirty flag first so we don't get infinite recursion when | |
| 350 retrieving the values below! */ | |
| 351 XCASE_TABLE (casetab)->dirty = 0; | |
| 352 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, | |
| 353 compute_canon_mapper, LISP_TO_VOID (casetab)); | |
| 354 map_char_table (XCASE_TABLE_CANON (casetab), &range, | |
| 355 initialize_identity_mapper, | |
| 356 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); | |
| 357 map_char_table (XCASE_TABLE_CANON (casetab), &range, | |
| 358 compute_up_or_eqv_mapper, | |
| 359 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); | |
| 360 } | |
| 361 | |
| 428 | 362 DEFUN ("current-case-table", Fcurrent_case_table, 0, 1, 0, /* |
| 363 Return the case table of BUFFER, which defaults to the current buffer. | |
| 364 */ | |
| 365 (buffer)) | |
| 366 { | |
| 367 struct buffer *buf = decode_buffer (buffer, 0); | |
| 368 | |
| 446 | 369 return buf->case_table; |
| 428 | 370 } |
| 371 | |
| 372 DEFUN ("standard-case-table", Fstandard_case_table, 0, 0, 0, /* | |
| 373 Return the standard case table. | |
| 374 This is the one used for new buffers. | |
| 375 */ | |
| 376 ()) | |
| 377 { | |
| 446 | 378 return Vstandard_case_table; |
| 428 | 379 } |
| 380 | |
| 826 | 381 static void |
| 382 convert_old_style_syntax_string (Lisp_Object table, Lisp_Object string) | |
| 383 { | |
| 867 | 384 Ichar i; |
| 826 | 385 |
| 386 for (i = 0; i < 256; i++) | |
| 867 | 387 SET_TRT_TABLE_OF (table, i, string_ichar (string, i)); |
| 826 | 388 } |
| 389 | |
| 390 static Lisp_Object | |
| 391 set_case_table (Lisp_Object table, int standard) | |
| 392 { | |
| 393 /* This function can GC */ | |
| 394 struct buffer *buf = | |
| 395 standard ? XBUFFER (Vbuffer_defaults) : current_buffer; | |
| 396 | |
| 397 check_case_table (table); | |
| 398 | |
| 399 if (CASE_TABLEP (table)) | |
| 400 { | |
| 401 if (standard) | |
| 402 Vstandard_case_table = table; | |
| 403 | |
| 404 buf->case_table = table; | |
| 405 } | |
| 406 else | |
| 407 { | |
| 408 /* For backward compatibility. */ | |
| 409 Lisp_Object down, up, canon, eqv, tail = table; | |
| 410 Lisp_Object casetab = | |
| 411 standard ? Vstandard_case_table : buf->case_table; | |
| 412 struct chartab_range range; | |
| 413 | |
| 414 range.type = CHARTAB_RANGE_ALL; | |
| 415 | |
| 416 Freset_char_table (XCASE_TABLE_DOWNCASE (casetab)); | |
| 417 Freset_char_table (XCASE_TABLE_UPCASE (casetab)); | |
| 418 Freset_char_table (XCASE_TABLE_CANON (casetab)); | |
| 419 Freset_char_table (XCASE_TABLE_EQV (casetab)); | |
| 420 | |
| 421 down = XCAR (tail); tail = XCDR (tail); | |
| 422 up = XCAR (tail); tail = XCDR (tail); | |
| 423 canon = XCAR (tail); tail = XCDR (tail); | |
| 424 eqv = XCAR (tail); | |
| 425 | |
| 426 convert_old_style_syntax_string (XCASE_TABLE_DOWNCASE (casetab), down); | |
| 427 | |
| 428 if (NILP (up)) | |
| 429 { | |
| 430 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, | |
| 431 initialize_identity_mapper, | |
| 432 LISP_TO_VOID (XCASE_TABLE_UPCASE (casetab))); | |
| 433 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, | |
| 434 compute_up_or_eqv_mapper, | |
| 435 LISP_TO_VOID (XCASE_TABLE_UPCASE (casetab))); | |
| 436 } | |
| 437 else | |
| 438 convert_old_style_syntax_string (XCASE_TABLE_UPCASE (casetab), up); | |
| 439 | |
| 440 if (NILP (canon)) | |
| 441 map_char_table (XCASE_TABLE_DOWNCASE (casetab), &range, | |
| 442 compute_canon_mapper, LISP_TO_VOID (casetab)); | |
| 443 else | |
| 444 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), canon); | |
| 445 | |
| 446 if (NILP (eqv)) | |
| 447 { | |
| 448 map_char_table (XCASE_TABLE_CANON (casetab), &range, | |
| 449 initialize_identity_mapper, | |
| 450 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); | |
| 451 map_char_table (XCASE_TABLE_CANON (casetab), &range, | |
| 452 compute_up_or_eqv_mapper, | |
| 453 LISP_TO_VOID (XCASE_TABLE_EQV (casetab))); | |
| 454 } | |
| 455 else | |
| 456 convert_old_style_syntax_string (XCASE_TABLE_CANON (casetab), eqv); | |
| 457 } | |
| 458 | |
| 459 return buf->case_table; | |
| 460 } | |
| 428 | 461 |
| 462 DEFUN ("set-case-table", Fset_case_table, 1, 1, 0, /* | |
| 444 | 463 Select CASE-TABLE as the new case table for the current buffer. |
| 446 | 464 A case table is a case-table object or list |
| 465 (DOWNCASE UPCASE CANONICALIZE EQUIVALENCES) | |
| 428 | 466 where each element is either nil or a string of length 256. |
| 446 | 467 The latter is provided for backward-compatibility. |
| 428 | 468 DOWNCASE maps each character to its lower-case equivalent. |
| 469 UPCASE maps each character to its upper-case equivalent; | |
| 470 if lower and upper case characters are in 1-1 correspondence, | |
| 471 you may use nil and the upcase table will be deduced from DOWNCASE. | |
| 472 CANONICALIZE maps each character to a canonical equivalent; | |
| 473 any two characters that are related by case-conversion have the same | |
| 474 canonical equivalent character; it may be nil, in which case it is | |
| 475 deduced from DOWNCASE and UPCASE. | |
| 476 EQUIVALENCES is a map that cyclicly permutes each equivalence class | |
| 477 (of characters with the same canonical equivalent); it may be nil, | |
| 478 in which case it is deduced from CANONICALIZE. | |
| 479 | |
| 446 | 480 See also `get-case-table', `put-case-table' and `put-case-table-pair'. |
| 428 | 481 */ |
| 444 | 482 (case_table)) |
| 428 | 483 { |
| 446 | 484 /* This function can GC */ |
| 444 | 485 return set_case_table (case_table, 0); |
| 428 | 486 } |
| 487 | |
| 488 DEFUN ("set-standard-case-table", Fset_standard_case_table, 1, 1, 0, /* | |
| 444 | 489 Select CASE-TABLE as the new standard case table for new buffers. |
| 428 | 490 See `set-case-table' for more info on case tables. |
| 491 */ | |
| 444 | 492 (case_table)) |
| 428 | 493 { |
| 446 | 494 /* This function can GC */ |
| 444 | 495 return set_case_table (case_table, 1); |
| 428 | 496 } |
| 497 | |
| 498 | |
| 499 void | |
| 500 syms_of_casetab (void) | |
| 501 { | |
| 446 | 502 INIT_LRECORD_IMPLEMENTATION (case_table); |
| 503 | |
| 563 | 504 DEFSYMBOL_MULTIWORD_PREDICATE (Qcase_tablep); |
| 505 DEFSYMBOL (Qdowncase); | |
| 506 DEFSYMBOL (Qupcase); | |
| 428 | 507 |
| 826 | 508 DEFSUBR (Fmake_case_table); |
| 428 | 509 DEFSUBR (Fcase_table_p); |
| 446 | 510 DEFSUBR (Fget_case_table); |
| 511 DEFSUBR (Fput_case_table); | |
| 512 DEFSUBR (Fput_case_table_pair); | |
| 428 | 513 DEFSUBR (Fcurrent_case_table); |
| 514 DEFSUBR (Fstandard_case_table); | |
| 446 | 515 DEFSUBR (Fcopy_case_table); |
| 428 | 516 DEFSUBR (Fset_case_table); |
| 517 DEFSUBR (Fset_standard_case_table); | |
| 518 } | |
| 519 | |
| 520 void | |
| 521 complex_vars_of_casetab (void) | |
| 522 { | |
| 867 | 523 REGISTER Ichar i; |
| 428 | 524 |
| 446 | 525 staticpro (&Vstandard_case_table); |
| 428 | 526 |
| 826 | 527 Vstandard_case_table = allocate_case_table (1); |
| 428 | 528 |
| 529 for (i = 0; i < 256; i++) | |
| 530 { | |
| 531 unsigned char lowered = tolower (i); | |
| 532 | |
| 826 | 533 SET_TRT_TABLE_OF (XCASE_TABLE_DOWNCASE (Vstandard_case_table), i, |
| 534 lowered); | |
| 428 | 535 } |
| 536 | |
| 537 for (i = 0; i < 256; i++) | |
| 538 { | |
| 539 unsigned char flipped = (isupper (i) ? tolower (i) | |
| 540 : (islower (i) ? toupper (i) : i)); | |
| 541 | |
| 826 | 542 SET_TRT_TABLE_OF (XCASE_TABLE_UPCASE (Vstandard_case_table), i, |
| 543 flipped); | |
| 428 | 544 } |
| 826 | 545 |
| 546 recompute_case_table (Vstandard_case_table); | |
| 428 | 547 } |