Mercurial > hg > xemacs-beta
view lisp/syntax.el @ 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 | 99e465e2da2e |
children | 308d34e9f07d |
line wrap: on
line source
;; syntax.el --- Syntax-table hacking stuff, moved from syntax.c ;; Copyright (C) 1993, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: FSF 19.28. ;;; Commentary: ;; This file is dumped with XEmacs. ;; Note: FSF does not have a file syntax.el. This stuff is ;; in syntax.c. See comments there about not merging past 19.28. ;; Significantly hacked upon by Ben Wing. ;;; Code: (defun make-syntax-table (&optional oldtable) "Return a new syntax table. It inherits all characters from the standard syntax table. A syntax table is a char table of type `syntax' (see `make-char-table'). The valid values are integers (intended to be syntax codes as generated by `syntax-string-to-code'), and the default result given by `get-char-table' is the syntax code for `word'. (Note: In 21.4 and prior, it was the code for `inherit'.) To modify a syntax table, you should normally use `modify-syntax-entry' rather than directly modify the table with `put-char-table'. See `modify-syntax-entry' for a description of the character codes used to indicate the various syntax classes." (make-char-table 'syntax)) (defun syntax-after (pos) "Return the raw syntax of the char after POS. If POS is outside the buffer's accessible portion, return nil." (unless (or (< pos (point-min)) (>= pos (point-max))) (let ((st (if lookup-syntax-properties (get-char-property pos 'syntax-table)))) (char-syntax (char-after pos) (or st (syntax-table)))))) (defun simple-set-syntax-entry (char spec table) (put-char-table char spec table)) (defun char-syntax-from-code (code) "Extract the syntax designator from the internal syntax code CODE. CODE is the value actually contained in the syntax table." (if (consp code) (setq code (car code))) (aref (syntax-designator-chars) (logand code 127))) (defun set-char-syntax-in-code (code desig) "Return a new internal syntax code whose syntax designator is DESIG. Other characteristics are the same as in CODE." (let ((newcode (if (consp code) (car code) code))) (setq newcode (logior (string-match (regexp-quote (char-to-string desig)) (syntax-designator-chars)) (logand newcode (lognot 127)))) (if (consp code) (cons newcode (cdr code)) newcode))) (defun syntax-code-to-string (code) "Return a string equivalent to internal syntax code CODE. The string can be passed to `modify-syntax-entry'. If CODE is invalid, return nil." (let ((match (and (consp code) (cdr code))) (codes (syntax-designator-chars))) (if (consp code) (setq code (car code))) (if (or (not (integerp code)) (> (logand code 127) (length codes))) nil (with-output-to-string (let* ((spec (elt codes (logand code 127))) (b3 (lsh code -16)) (start1 (/= 0 (logand b3 128))) ;logtest! (start1b (/= 0 (logand b3 64))) (start2 (/= 0 (logand b3 32))) (start2b (/= 0 (logand b3 16))) (end1 (/= 0 (logand b3 8))) (end1b (/= 0 (logand b3 4))) (end2 (/= 0 (logand b3 2))) (end2b (/= 0 (logand b3 1))) (prefix (/= 0 (logand code 128))) (single-char-p (or (= spec ?<) (= spec ?>))) ) (write-char spec) (write-char (if match match 32)) ;;; (if start1 (if single-char-p (write-char ?a) (write-char ?1))) (if start1 (if single-char-p (write-char ? ) (write-char ?1))) (if start2 (write-char ?2)) ;;; (if end1 (if single-char-p (write-char ?a) (write-char ?3))) (if end1 (if single-char-p (write-char ? ) (write-char ?3))) (if end2 (write-char ?4)) (if start1b (if single-char-p (write-char ?b) (write-char ?5))) (if start2b (write-char ?6)) (if end1b (if single-char-p (write-char ?b) (write-char ?7))) (if end2b (write-char ?8)) (if prefix (write-char ?p))))))) (defun syntax-string-to-code (string) "Return the internal syntax code equivalent to STRING. STRING should be something acceptable as the second argument to `modify-syntax-entry'. If STRING is invalid, signal an error." (let* ((bflag nil) (b3 0) (ch0 (aref string 0)) (len (length string)) (code (string-match (regexp-quote (char-to-string ch0)) (syntax-designator-chars))) (i 2) ch) (or code (error "Invalid syntax designator: %S" string)) (while (< i len) (setq ch (aref string i)) (incf i) (case ch (?1 (setq b3 (logior b3 128))) (?2 (setq b3 (logior b3 32))) (?3 (setq b3 (logior b3 8))) (?4 (setq b3 (logior b3 2))) (?5 (setq b3 (logior b3 64))) (?6 (setq b3 (logior b3 16))) (?7 (setq b3 (logior b3 4))) (?8 (setq b3 (logior b3 1))) (?a (case ch0 (?< (setq b3 (logior b3 128))) (?> (setq b3 (logior b3 8))))) (?b (case ch0 (?< (setq b3 (logior b3 64) bflag t)) (?> (setq b3 (logior b3 4) bflag t)))) (?p (setq code (logior code (lsh 1 7)))) (?\ nil) ;; ignore for compatibility (otherwise (error "Invalid syntax description flag: %S" string)))) ;; default single char style if `b' has not been seen (if (not bflag) (case ch0 (?< (setq b3 (logior b3 128))) (?> (setq b3 (logior b3 8))))) (setq code (logior code (lsh b3 16))) (if (and (> len 1) ;; tough luck if you want to make space a paren! (/= (aref string 1) ?\ )) (setq code (cons code (aref string 1)))) code)) (defun modify-syntax-entry (char-range spec &optional syntax-table) "Set syntax for the characters CHAR-RANGE according to string SPEC. CHAR-RANGE is a single character or a range of characters, as per `put-char-table'. The syntax is changed only for SYNTAX-TABLE, which defaults to the current buffer's syntax table. The first character of SPEC should be one of the following: Space whitespace syntax. w word constituent. _ symbol constituent. . punctuation. \( open-parenthesis. \) close-parenthesis. \" string quote. \\ character-quote. $ paired delimiter. ' expression quote or prefix operator. < comment starter. > comment ender. / character-quote. @ inherit from `standard-syntax-table'. Only single-character comment start and end sequences are represented thus. Two-character sequences are represented as described below. The second character of SPEC is the matching parenthesis, used only if the first character is `(' or `)'. Any additional characters are flags. Defined flags are the characters 1, 2, 3, 4, 5, 6, 7, 8, p, a, and b. 1 means C is the first of a two-char comment start sequence of style a. 2 means C is the second character of such a sequence. 3 means C is the first of a two-char comment end sequence of style a. 4 means C is the second character of such a sequence. 5 means C is the first of a two-char comment start sequence of style b. 6 means C is the second character of such a sequence. 7 means C is the first of a two-char comment end sequence of style b. 8 means C is the second character of such a sequence. p means C is a prefix character for `backward-prefix-chars'; such characters are treated as whitespace when they occur between expressions. a means C is comment starter or comment ender for comment style a (default) b means C is comment starter or comment ender for comment style b." (interactive ;; I really don't know why this is interactive ;; help-form should at least be made useful while reading the second arg "cSet syntax for character: \nsSet syntax for %c to: ") (simple-set-syntax-entry char-range (syntax-string-to-code spec) (cond ((syntax-table-p syntax-table) syntax-table) ((null syntax-table) (syntax-table)) (t (wrong-type-argument 'syntax-table-p syntax-table)))) nil) ((macro . (lambda (map-syntax-definition) "Replace the variable names in MAP-SYNTAX-DEFINITION with uninterned symbols, at byte-compile time. This avoids the risk of variable names within the functions called from MAP-SYNTAX-DEFINITION being shared with MAP-SYNTAX-DEFINITION, and as such subject to modification, one of the common downsides of dynamic scope." (nsublis '((syntax-table . #:syntax-table) (m-s-function . #:function) (range . #:range) (key . #:key) (value . #:value)) map-syntax-definition))) (defun map-syntax-table (m-s-function syntax-table &optional range) "Map FUNCTION over entries in SYNTAX-TABLE, collapsing inheritance. This is similar to `map-char-table', but works only on syntax tables, and collapses any entries that call for inheritance by invisibly substituting the inherited values from the standard syntax table." (check-argument-type 'syntax-table-p syntax-table) (map-char-table #'(lambda (key value) (if (eq ?@ (char-syntax-from-code value)) (map-char-table #'(lambda (key value) (funcall m-s-function key value)) (standard-syntax-table) key) (funcall m-s-function key value))) syntax-table range))) ;(defun test-xm () ; (let ((o (copy-syntax-table)) ; (n (copy-syntax-table)) ; (codes (syntax-designator-chars)) ; (flags "12345678abp")) ; (while t ; (let ((spec (concat (char-to-string (elt codes ; (random (length codes)))))) ; (if (= (random 4) 0) ; "b" ; " ") ; (let* ((n (random 4)) ; (s (make-string n 0))) ; (while (> n 0) ; (setq n (1- n)) ; (aset s n (aref flags (random (length flags))))) ; s)))) ; (message "%S..." spec) ; (modify-syntax-entry ?a spec o) ; (xmodify-syntax-entry ?a spec n) ; (or (= (aref o ?a) (aref n ?a)) ; (error "%s" ; (format "fucked with %S: %x %x" ; spec (aref o ?a) (aref n ?a)))))))) (defun describe-char-table (table mapper describe-value stream) "Describe char-table TABLE, outputting to STREAM. MAPPER maps over the table and should be `map-char-table' or `map-syntax-table'. DESCRIBE-VALUE is a function of two arguments, VALUE and STREAM, and should output a description of VALUE." (let (first-char last-char prev-val (describe-one (if (featurep 'mule) #'(lambda (first last value stream) (if (equal first last) (cond ((vectorp first) (princ (format "%s, row %d\t" (declare-fboundp (charset-name (aref first 0))) (aref first 1)) stream)) ((symbolp first) (princ first stream) (princ "\t" stream)) (t (princ (text-char-description first) stream) (princ "\t" stream))) (cond ((vectorp first) (princ (format "%s, rows %d .. %d\t" (declare-fboundp (charset-name (aref first 0))) (aref first 1) (aref last 1)) stream)) ((symbolp first) (princ (format "%s .. %s\t" first last) stream)) (t (princ (format "%s .. %s\t" (text-char-description first) (text-char-description last)) stream)))) (funcall describe-value value stream)) #'(lambda (first last value stream) (let* ((tem (text-char-description first)) (pos (length tem)) ;;(limit (cond ((numberp ctl-arrow) ctl-arrow) ;; ((memq ctl-arrow '(t nil)) 256) ;; (t 160))) ) (princ tem stream) (if (> last first) (progn (princ " .. " stream) (setq tem (text-char-description last)) (princ tem stream) (setq pos (+ pos (length tem) 4)))) (while (progn (write-char ?\ stream) (setq pos (1+ pos)) (< pos 16)))) (funcall describe-value value stream))))) (funcall mapper #'(lambda (range value) (cond ((not first-char) (setq first-char range last-char range prev-val value)) ((and (equal value prev-val) (or (and (characterp range) (characterp first-char) (or (not (featurep 'mule)) (eq (declare-fboundp (char-charset range)) (declare-fboundp (char-charset first-char)))) (= (char-int last-char) (1- (char-int range)))) (and (vectorp range) (vectorp first-char) (eq (aref range 0) (aref first-char 0)) (= (aref last-char 1) (1- (aref range 1)))))) (setq last-char range)) (t (funcall describe-one first-char last-char prev-val stream) (setq first-char range last-char range prev-val value))) nil) table) (if first-char (funcall describe-one first-char last-char prev-val stream)))) (defun describe-syntax-table (table stream) "Output a description of TABLE (a syntax table) to STREAM." (describe-char-table table 'map-syntax-table 'describe-syntax-code stream)) (defun describe-syntax-code (code stream) (let ((match (and (consp code) (cdr code))) (invalid (gettext "**invalid**")) ;(empty "") ;constants (standard-output (or stream standard-output)) ;; #### I18N3 should temporarily set buffer to output-translatable (in #'(lambda (string) (princ ",\n\t\t\t\t ") (princ string))) (syntax-string (syntax-code-to-string code))) (if (consp code) (setq code (car code))) (if (null syntax-string) (princ invalid) (princ syntax-string) (princ "\tmeaning: ") (princ (aref ["whitespace" "punctuation" "word-constituent" "symbol-constituent" "open-paren" "close-paren" "expression-prefix" "string-quote" "paired-delimiter" "escape" "character-quote" "comment-begin" "comment-end" "inherit" "extended-word-constituent"] (logand code 127))) (if match (progn (princ ", matches ") (princ (text-char-description match)))) (let* ((spec (elt syntax-string 0)) (b3 (lsh code -16)) (start1 (/= 0 (logand b3 128))) ;logtest! (start1b (/= 0 (logand b3 64))) (start2 (/= 0 (logand b3 32))) (start2b (/= 0 (logand b3 16))) (end1 (/= 0 (logand b3 8))) (end1b (/= 0 (logand b3 4))) (end2 (/= 0 (logand b3 2))) (end2b (/= 0 (logand b3 1))) (prefix (/= 0 (logand code 128))) (single-char-p (or (= spec ?<) (= spec ?>)))) (if start1 (if single-char-p (princ ", style A") (funcall in (gettext "first character of comment-start sequence A")))) (if start2 (funcall in (gettext "second character of comment-start sequence A"))) (if end1 (if single-char-p (princ ", style A") (funcall in (gettext "first character of comment-end sequence A")))) (if end2 (funcall in (gettext "second character of comment-end sequence A"))) (if start1b (if single-char-p (princ ", style B") (funcall in (gettext "first character of comment-start sequence B")))) (if start2b (funcall in (gettext "second character of comment-start sequence B"))) (if end1b (if single-char-p (princ ", style B") (funcall in (gettext "first character of comment-end sequence B")))) (if end2b (funcall in (gettext "second character of comment-end sequence B"))) (if prefix (funcall in (gettext "prefix character for `backward-prefix-chars'")))) (terpri stream)))) (defun symbol-near-point () "Return the first textual item to the nearest point." (interactive) ;alg stolen from etag.el (save-excursion (if (or (bobp) (not (memq (char-syntax (char-before)) '(?w ?_)))) (while (not (looking-at "\\sw\\|\\s_\\|\\'")) (forward-char 1))) (while (looking-at "\\sw\\|\\s_") (forward-char 1)) (if (re-search-backward "\\sw\\|\\s_" nil t) (regexp-quote (progn (forward-char 1) (buffer-substring (point) (progn (forward-sexp -1) (while (looking-at "\\s'") (forward-char 1)) (point))))) nil))) ;;; syntax.el ends here