Mercurial > hg > xemacs-beta
annotate lisp/syntax.el @ 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 | 7039e6323819 |
| children | 2f31c7aa4e96 |
| rev | line source |
|---|---|
| 428 | 1 ;; syntax.el --- Syntax-table hacking stuff, moved from syntax.c |
| 2 | |
| 3 ;; Copyright (C) 1993, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 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 | |
| 10 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 11 ;; any later version. | |
| 12 | |
| 13 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 14 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 ;; General Public License for more details. | |
| 17 | |
| 18 ;; You should have received a copy of the GNU General Public License | |
| 444 | 19 ;; along with XEmacs; see the file COPYING. If not, write to the |
| 428 | 20 ;; Free Software Foundation, 59 Temple Place - Suite 330, |
| 21 ;; Boston, MA 02111-1307, USA. | |
| 22 | |
| 23 ;;; Synched up with: FSF 19.28. | |
| 24 | |
| 25 ;;; Commentary: | |
| 26 | |
| 27 ;; This file is dumped with XEmacs. | |
| 28 | |
| 29 ;; Note: FSF does not have a file syntax.el. This stuff is | |
| 30 ;; in syntax.c. See comments there about not merging past 19.28. | |
| 31 | |
| 32 ;; Significantly hacked upon by Ben Wing. | |
| 33 | |
| 34 ;;; Code: | |
| 35 | |
| 36 (defun make-syntax-table (&optional oldtable) | |
| 37 "Return a new syntax table. | |
| 38 It inherits all characters from the standard syntax table." | |
| 39 (make-char-table 'syntax)) | |
| 40 | |
| 41 (defun simple-set-syntax-entry (char spec table) | |
| 42 (put-char-table char spec table)) | |
| 43 | |
| 44 (defun char-syntax-from-code (code) | |
| 45 "Extract the syntax designator from the internal syntax code CODE. | |
| 46 CODE is the value actually contained in the syntax table." | |
| 47 (if (consp code) | |
| 48 (setq code (car code))) | |
| 49 (aref (syntax-designator-chars) (logand code 127))) | |
| 50 | |
| 51 (defun set-char-syntax-in-code (code desig) | |
| 52 "Return a new internal syntax code whose syntax designator is DESIG. | |
| 53 Other characteristics are the same as in CODE." | |
| 54 (let ((newcode (if (consp code) (car code) code))) | |
| 55 (setq newcode (logior (string-match | |
| 56 (regexp-quote (char-to-string desig)) | |
| 57 (syntax-designator-chars)) | |
| 58 (logand newcode (lognot 127)))) | |
| 59 (if (consp code) (cons newcode (cdr code)) | |
| 60 newcode))) | |
| 61 | |
| 62 (defun syntax-code-to-string (code) | |
| 63 "Return a string equivalent to internal syntax code CODE. | |
| 64 The string can be passed to `modify-syntax-entry'. | |
| 65 If CODE is invalid, return nil." | |
| 66 (let ((match (and (consp code) (cdr code))) | |
| 67 (codes (syntax-designator-chars))) | |
| 68 (if (consp code) | |
| 69 (setq code (car code))) | |
| 70 (if (or (not (integerp code)) | |
| 71 (> (logand code 127) (length codes))) | |
| 72 nil | |
| 73 (with-output-to-string | |
| 74 (let* ((spec (elt codes (logand code 127))) | |
| 75 (b3 (lsh code -16)) | |
| 76 (start1 (/= 0 (logand b3 128))) ;logtest! | |
| 77 (start1b (/= 0 (logand b3 64))) | |
| 78 (start2 (/= 0 (logand b3 32))) | |
| 79 (start2b (/= 0 (logand b3 16))) | |
| 80 (end1 (/= 0 (logand b3 8))) | |
| 81 (end1b (/= 0 (logand b3 4))) | |
| 82 (end2 (/= 0 (logand b3 2))) | |
| 83 (end2b (/= 0 (logand b3 1))) | |
| 84 (prefix (/= 0 (logand code 128))) | |
| 85 (single-char-p (or (= spec ?<) (= spec ?>))) | |
| 86 ) | |
| 87 (write-char spec) | |
| 88 (write-char (if match match 32)) | |
| 89 ;;; (if start1 (if single-char-p (write-char ?a) (write-char ?1))) | |
| 90 (if start1 (if single-char-p (write-char ? ) (write-char ?1))) | |
| 91 (if start2 (write-char ?2)) | |
| 92 ;;; (if end1 (if single-char-p (write-char ?a) (write-char ?3))) | |
| 93 (if end1 (if single-char-p (write-char ? ) (write-char ?3))) | |
| 94 (if end2 (write-char ?4)) | |
| 95 (if start1b (if single-char-p (write-char ?b) (write-char ?5))) | |
| 96 (if start2b (write-char ?6)) | |
| 97 (if end1b (if single-char-p (write-char ?b) (write-char ?7))) | |
| 98 (if end2b (write-char ?8)) | |
| 99 (if prefix (write-char ?p))))))) | |
| 100 | |
| 101 (defun syntax-string-to-code (string) | |
| 102 "Return the internal syntax code equivalent to STRING. | |
| 103 STRING should be something acceptable as the second argument to | |
| 104 `modify-syntax-entry'. | |
| 105 If STRING is invalid, signal an error." | |
| 106 (let* ((bflag nil) | |
| 107 (b3 0) | |
| 108 (ch0 (aref string 0)) | |
| 109 (len (length string)) | |
| 110 (code (string-match (regexp-quote (char-to-string ch0)) | |
| 111 (syntax-designator-chars))) | |
| 112 (i 2) | |
| 113 ch) | |
| 114 (or code | |
| 115 (error "Invalid syntax designator: %S" string)) | |
| 116 (while (< i len) | |
| 117 (setq ch (aref string i)) | |
| 118 (incf i) | |
| 119 (case ch | |
| 120 (?1 (setq b3 (logior b3 128))) | |
| 121 (?2 (setq b3 (logior b3 32))) | |
| 122 (?3 (setq b3 (logior b3 8))) | |
| 123 (?4 (setq b3 (logior b3 2))) | |
| 124 (?5 (setq b3 (logior b3 64))) | |
| 125 (?6 (setq b3 (logior b3 16))) | |
| 126 (?7 (setq b3 (logior b3 4))) | |
| 127 (?8 (setq b3 (logior b3 1))) | |
| 128 (?a (case ch0 | |
| 129 (?< (setq b3 (logior b3 128))) | |
| 130 (?> (setq b3 (logior b3 8))))) | |
| 131 (?b (case ch0 | |
| 132 (?< (setq b3 (logior b3 64) bflag t)) | |
| 133 (?> (setq b3 (logior b3 4) bflag t)))) | |
| 134 (?p (setq code (logior code (lsh 1 7)))) | |
| 135 (?\ nil) ;; ignore for compatibility | |
| 136 (otherwise | |
| 137 (error "Invalid syntax description flag: %S" string)))) | |
| 138 ;; default single char style if `b' has not been seen | |
| 139 (if (not bflag) | |
| 140 (case ch0 | |
| 141 (?< (setq b3 (logior b3 128))) | |
| 142 (?> (setq b3 (logior b3 8))))) | |
| 143 (setq code (logior code (lsh b3 16))) | |
| 144 (if (and (> len 1) | |
| 145 ;; tough luck if you want to make space a paren! | |
| 146 (/= (aref string 1) ?\ )) | |
| 147 (setq code (cons code (aref string 1)))) | |
| 148 code)) | |
| 149 | |
| 444 | 150 (defun modify-syntax-entry (char-range spec &optional syntax-table) |
| 428 | 151 "Set syntax for the characters CHAR-RANGE according to string SPEC. |
| 152 CHAR-RANGE is a single character or a range of characters, | |
| 153 as per `put-char-table'. | |
| 444 | 154 The syntax is changed only for SYNTAX-TABLE, which defaults to |
| 428 | 155 the current buffer's syntax table. |
| 156 The first character of SPEC should be one of the following: | |
| 157 Space whitespace syntax. w word constituent. | |
| 158 _ symbol constituent. . punctuation. | |
| 159 \( open-parenthesis. \) close-parenthesis. | |
| 160 \" string quote. \\ character-quote. | |
| 161 $ paired delimiter. ' expression quote or prefix operator. | |
| 162 < comment starter. > comment ender. | |
| 163 / character-quote. @ inherit from `standard-syntax-table'. | |
| 164 | |
| 165 Only single-character comment start and end sequences are represented thus. | |
| 166 Two-character sequences are represented as described below. | |
| 167 The second character of SPEC is the matching parenthesis, | |
| 168 used only if the first character is `(' or `)'. | |
| 169 Any additional characters are flags. | |
| 170 Defined flags are the characters 1, 2, 3, 4, 5, 6, 7, 8, p, a, and b. | |
| 171 1 means C is the first of a two-char comment start sequence of style a. | |
| 172 2 means C is the second character of such a sequence. | |
| 173 3 means C is the first of a two-char comment end sequence of style a. | |
| 174 4 means C is the second character of such a sequence. | |
| 175 5 means C is the first of a two-char comment start sequence of style b. | |
| 176 6 means C is the second character of such a sequence. | |
| 177 7 means C is the first of a two-char comment end sequence of style b. | |
| 178 8 means C is the second character of such a sequence. | |
| 179 p means C is a prefix character for `backward-prefix-chars'; | |
| 180 such characters are treated as whitespace when they occur | |
| 181 between expressions. | |
| 182 a means C is comment starter or comment ender for comment style a (default) | |
| 183 b means C is comment starter or comment ender for comment style b." | |
| 444 | 184 (interactive |
| 428 | 185 ;; I really don't know why this is interactive |
| 186 ;; help-form should at least be made useful while reading the second arg | |
| 187 "cSet syntax for character: \nsSet syntax for %c to: ") | |
| 444 | 188 (simple-set-syntax-entry |
| 189 char-range | |
| 190 (syntax-string-to-code spec) | |
| 191 (cond ((syntax-table-p syntax-table) | |
| 192 syntax-table) | |
| 193 ((null syntax-table) | |
| 194 (syntax-table)) | |
| 195 (t | |
| 196 (wrong-type-argument 'syntax-table-p syntax-table)))) | |
| 428 | 197 nil) |
| 198 | |
| 444 | 199 (defun map-syntax-table (__function __syntax_table &optional __range) |
| 200 "Map FUNCTION over entries in SYNTAX-TABLE, collapsing inheritance. | |
| 428 | 201 This is similar to `map-char-table', but works only on syntax tables, and |
| 202 collapses any entries that call for inheritance by invisibly substituting | |
| 203 the inherited values from the standard syntax table." | |
| 444 | 204 (check-argument-type 'syntax-table-p __syntax_table) |
| 428 | 205 (map-char-table #'(lambda (__key __value) |
| 206 (if (eq ?@ (char-syntax-from-code __value)) | |
| 207 (map-char-table #'(lambda (__key __value) | |
| 208 (funcall __function | |
| 209 __key __value)) | |
| 210 (standard-syntax-table) | |
| 211 __key) | |
| 212 (funcall __function __key __value))) | |
| 444 | 213 __syntax_table __range)) |
| 428 | 214 |
| 215 ;(defun test-xm () | |
| 216 ; (let ((o (copy-syntax-table)) | |
| 217 ; (n (copy-syntax-table)) | |
| 218 ; (codes (syntax-designator-chars)) | |
| 219 ; (flags "12345678abp")) | |
| 220 ; (while t | |
| 221 ; (let ((spec (concat (char-to-string (elt codes | |
| 222 ; (random (length codes)))))) | |
| 223 ; (if (= (random 4) 0) | |
| 224 ; "b" | |
| 225 ; " ") | |
| 226 ; (let* ((n (random 4)) | |
| 227 ; (s (make-string n 0))) | |
| 228 ; (while (> n 0) | |
| 229 ; (setq n (1- n)) | |
| 230 ; (aset s n (aref flags (random (length flags))))) | |
| 231 ; s)))) | |
| 232 ; (message "%S..." spec) | |
| 233 ; (modify-syntax-entry ?a spec o) | |
| 234 ; (xmodify-syntax-entry ?a spec n) | |
| 235 ; (or (= (aref o ?a) (aref n ?a)) | |
| 236 ; (error "%s" | |
| 237 ; (format "fucked with %S: %x %x" | |
| 238 ; spec (aref o ?a) (aref n ?a)))))))) | |
| 239 | |
| 240 | |
| 241 (defun describe-syntax-table (table stream) | |
| 242 (let (first-char | |
| 243 last-char | |
| 244 prev-val | |
| 245 (describe-one | |
| 246 (if (featurep 'mule) | |
| 247 #'(lambda (first last value stream) | |
| 248 (if (equal first last) | |
| 249 (cond ((vectorp first) | |
| 250 (princ (format "%s, row %d\t" | |
| 502 | 251 (declare-fboundp (charset-name |
| 252 (aref first 0))) | |
| 428 | 253 (aref first 1)) |
| 254 stream)) | |
| 255 ((symbolp first) | |
| 256 (princ first stream) | |
| 257 (princ "\t" stream)) | |
| 258 (t | |
| 259 (princ (text-char-description first) stream) | |
| 260 (princ "\t" stream))) | |
| 261 (cond ((vectorp first) | |
| 262 (princ (format "%s, rows %d .. %d\t" | |
| 502 | 263 (declare-fboundp (charset-name |
| 264 (aref first 0))) | |
| 428 | 265 (aref first 1) |
| 266 (aref last 1)) | |
| 267 stream)) | |
| 268 ((symbolp first) | |
| 269 (princ (format "%s .. %s\t" first last) stream)) | |
| 270 (t | |
| 271 (princ (format "%s .. %s\t" | |
| 272 (text-char-description first) | |
| 273 (text-char-description last)) | |
| 274 stream)))) | |
| 275 (describe-syntax-code value stream)) | |
| 276 #'(lambda (first last value stream) | |
| 277 (let* ((tem (text-char-description first)) | |
| 278 (pos (length tem)) | |
| 279 ;;(limit (cond ((numberp ctl-arrow) ctl-arrow) | |
| 280 ;; ((memq ctl-arrow '(t nil)) 256) | |
| 281 ;; (t 160))) | |
| 282 ) | |
| 283 (princ tem stream) | |
| 284 (if (> last first) | |
| 285 (progn | |
| 286 (princ " .. " stream) | |
| 287 (setq tem (text-char-description last)) | |
| 288 (princ tem stream) | |
| 289 (setq pos (+ pos (length tem) 4)))) | |
| 290 (while (progn (write-char ?\ stream) | |
| 291 (setq pos (1+ pos)) | |
| 292 (< pos 16)))) | |
| 293 (describe-syntax-code value stream))))) | |
| 294 (map-syntax-table | |
| 295 #'(lambda (range value) | |
| 296 (cond | |
| 297 ((not first-char) | |
| 298 (setq first-char range | |
| 299 last-char range | |
| 300 prev-val value)) | |
| 301 ((and (equal value prev-val) | |
| 302 (or | |
| 303 (and (characterp range) | |
| 304 (characterp first-char) | |
| 305 (or (not (featurep 'mule)) | |
| 502 | 306 (eq (declare-fboundp (char-charset range)) |
| 307 (declare-fboundp (char-charset first-char)))) | |
| 428 | 308 (= (char-int last-char) (1- (char-int range)))) |
| 309 (and (vectorp range) | |
| 310 (vectorp first-char) | |
| 311 (eq (aref range 0) (aref first-char 0)) | |
| 312 (= (aref last-char 1) (1- (aref range 1)))))) | |
| 313 (setq last-char range)) | |
| 314 (t | |
| 315 (funcall describe-one first-char last-char prev-val stream) | |
| 316 (setq first-char range | |
| 317 last-char range | |
| 318 prev-val value))) | |
| 319 nil) | |
| 320 table) | |
| 321 (if first-char | |
| 322 (funcall describe-one first-char last-char prev-val stream)))) | |
| 323 | |
| 324 (defun describe-syntax-code (code stream) | |
| 325 (let ((match (and (consp code) (cdr code))) | |
| 326 (invalid (gettext "**invalid**")) ;(empty "") ;constants | |
| 327 (standard-output (or stream standard-output)) | |
| 328 ;; #### I18N3 should temporarily set buffer to output-translatable | |
| 329 (in #'(lambda (string) | |
| 330 (princ ",\n\t\t\t\t ") | |
| 331 (princ string))) | |
| 332 (syntax-string (syntax-code-to-string code))) | |
| 333 (if (consp code) | |
| 334 (setq code (car code))) | |
| 335 (if (null syntax-string) | |
| 336 (princ invalid) | |
| 337 (princ syntax-string) | |
| 338 (princ "\tmeaning: ") | |
| 339 (princ (aref ["whitespace" "punctuation" "word-constituent" | |
| 340 "symbol-constituent" "open-paren" "close-paren" | |
| 341 "expression-prefix" "string-quote" "paired-delimiter" | |
| 342 "escape" "character-quote" "comment-begin" "comment-end" | |
| 343 "inherit" "extended-word-constituent"] | |
| 344 (logand code 127))) | |
| 345 | |
| 346 (if match | |
| 347 (progn | |
| 348 (princ ", matches ") | |
| 349 (princ (text-char-description match)))) | |
| 350 (let* ((spec (elt syntax-string 0)) | |
| 351 (b3 (lsh code -16)) | |
| 352 (start1 (/= 0 (logand b3 128))) ;logtest! | |
| 353 (start1b (/= 0 (logand b3 64))) | |
| 354 (start2 (/= 0 (logand b3 32))) | |
| 355 (start2b (/= 0 (logand b3 16))) | |
| 356 (end1 (/= 0 (logand b3 8))) | |
| 357 (end1b (/= 0 (logand b3 4))) | |
| 358 (end2 (/= 0 (logand b3 2))) | |
| 359 (end2b (/= 0 (logand b3 1))) | |
| 360 (prefix (/= 0 (logand code 128))) | |
| 361 (single-char-p (or (= spec ?<) (= spec ?>)))) | |
| 362 (if start1 | |
| 363 (if single-char-p | |
| 364 (princ ", style A") | |
| 365 (funcall in | |
| 366 (gettext "first character of comment-start sequence A")))) | |
| 367 (if start2 | |
| 368 (funcall in | |
| 369 (gettext "second character of comment-start sequence A"))) | |
| 370 (if end1 | |
| 371 (if single-char-p | |
| 372 (princ ", style A") | |
| 373 (funcall in | |
| 374 (gettext "first character of comment-end sequence A")))) | |
| 375 (if end2 | |
| 376 (funcall in | |
| 377 (gettext "second character of comment-end sequence A"))) | |
| 378 (if start1b | |
| 379 (if single-char-p | |
| 380 (princ ", style B") | |
| 381 (funcall in | |
| 382 (gettext "first character of comment-start sequence B")))) | |
| 383 (if start2b | |
| 384 (funcall in | |
| 385 (gettext "second character of comment-start sequence B"))) | |
| 386 (if end1b | |
| 387 (if single-char-p | |
| 388 (princ ", style B") | |
| 389 (funcall in | |
| 390 (gettext "first character of comment-end sequence B")))) | |
| 391 (if end2b | |
| 392 (funcall in | |
| 393 (gettext "second character of comment-end sequence B"))) | |
| 394 (if prefix | |
| 395 (funcall in | |
| 396 (gettext "prefix character for `backward-prefix-chars'")))) | |
| 397 (terpri stream)))) | |
| 398 | |
| 399 (defun symbol-near-point () | |
| 400 "Return the first textual item to the nearest point." | |
| 401 (interactive) | |
| 402 ;alg stolen from etag.el | |
| 403 (save-excursion | |
| 404 (if (or (bobp) (not (memq (char-syntax (char-before)) '(?w ?_)))) | |
| 405 (while (not (looking-at "\\sw\\|\\s_\\|\\'")) | |
| 406 (forward-char 1))) | |
| 407 (while (looking-at "\\sw\\|\\s_") | |
| 408 (forward-char 1)) | |
| 409 (if (re-search-backward "\\sw\\|\\s_" nil t) | |
| 410 (regexp-quote | |
| 411 (progn (forward-char 1) | |
| 412 (buffer-substring (point) | |
| 413 (progn (forward-sexp -1) | |
| 414 (while (looking-at "\\s'") | |
| 415 (forward-char 1)) | |
| 416 (point))))) | |
| 417 nil))) | |
| 418 | |
| 419 ;;; syntax.el ends here |