Mercurial > hg > xemacs-beta
annotate lisp/symbol-syntax.el @ 5013:ae48681c47fa
changes to VOID_TO_LISP et al.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* casetab.c (compute_canon_mapper):
* casetab.c (initialize_identity_mapper):
* casetab.c (compute_up_or_eqv_mapper):
* casetab.c (recompute_case_table):
* casetab.c (set_case_table):
* chartab.c (copy_mapper):
* chartab.c (copy_char_table_range):
* chartab.c (get_range_char_table_1):
* console.c (find_nonminibuffer_frame_not_on_console_predicate):
* console.c (find_nonminibuffer_frame_not_on_console):
* console.c (nuke_all_console_slots):
* device.c:
* device.c (find_nonminibuffer_frame_not_on_device_predicate):
* device.c (find_nonminibuffer_frame_not_on_device):
* dialog-msw.c (dialog_proc):
* dialog-msw.c (handle_question_dialog_box):
* dialog-x.c (maybe_run_dbox_text_callback):
* eval.c:
* eval.c (safe_run_hook_trapping_problems_1):
* eval.c (safe_run_hook_trapping_problems):
* event-msw.c:
* event-msw.c (mswindows_wnd_proc):
* event-msw.c (mswindows_find_frame):
* faces.c (update_face_inheritance_mapper):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_get_mouse_position):
* frame-msw.c (mswindows_get_frame_parent):
* glade.c (connector):
* glade.c (Fglade_xml_signal_connect):
* glade.c (Fglade_xml_signal_autoconnect):
* glade.c (Fglade_xml_textdomain):
* glyphs-msw.c (mswindows_subwindow_instantiate):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs.c (check_instance_cache_mapper):
* glyphs.c (check_window_subwindow_cache):
* glyphs.c (check_image_instance_structure):
* gui-x.c (snarf_widget_value_mapper):
* gui-x.c (popup_selection_callback):
* gui-x.c (button_item_to_widget_value):
* keymap.c (map_keymap_mapper):
* keymap.c (Fmap_keymap):
* menubar-gtk.c (__torn_off_sir):
* menubar-gtk.c (__activate_menu):
* menubar-gtk.c (menu_convert):
* menubar-gtk.c (__generic_button_callback):
* menubar-gtk.c (menu_descriptor_to_widget_1):
* menubar-msw.c:
* menubar-msw.c (EMPTY_ITEM_ID):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* menubar-x.c (pre_activate_callback):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar-x.c (command_builder_find_menu_accelerator):
* print.c (print_internal):
* process-unix.c (close_process_descs_mapfun):
* process.c (get_process_from_usid):
* process.c (init_process_io_handles):
* profile.c (sigprof_handler):
* profile.c (get_profiling_info_timing_maphash):
* profile.c (Fget_profiling_info):
* profile.c (set_profiling_info_timing_maphash):
* profile.c (mark_profiling_info_maphash):
* scrollbar-msw.c (mswindows_create_scrollbar_instance):
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (mswindows_handle_scrollbar_event):
* specifier.c (recompute_cached_specifier_everywhere_mapfun):
* specifier.c (recompute_cached_specifier_everywhere):
* syntax.c (copy_to_mirrortab):
* syntax.c (copy_if_not_already_present):
* syntax.c (update_just_this_syntax_table):
* text.c (new_dfc_convert_now_damn_it):
* text.h (LISP_STRING_TO_EXTERNAL):
* tooltalk.c:
* tooltalk.c (tooltalk_message_callback):
* tooltalk.c (tooltalk_pattern_callback):
* tooltalk.c (Fcreate_tooltalk_message):
* tooltalk.c (Fcreate_tooltalk_pattern):
* ui-byhand.c (__generic_toolbar_callback):
* ui-byhand.c (generic_toolbar_insert_item):
* ui-byhand.c (__emacs_gtk_ctree_recurse_internal):
* ui-byhand.c (Fgtk_ctree_recurse):
* ui-gtk.c (__internal_callback_destroy):
* ui-gtk.c (__internal_callback_marshal):
* ui-gtk.c (Fgtk_signal_connect):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (lisp_to_gtk_type):
* ui-gtk.c (lisp_to_gtk_ret_type):
* lisp-disunion.h:
* lisp-disunion.h (NON_LVALUE):
* lisp-union.h:
* lisp.h (LISP_HASH):
Rename:
LISP_TO_VOID -> STORE_LISP_IN_VOID
VOID_TO_LISP -> GET_LISP_FROM_VOID
These new names are meant to clearly identify that the Lisp object
is the source and void the sink, and that they can't be used the
other way around -- they aren't exact opposites despite the old
names. The names are also important given the new functions
created just below. Also, clarify comments in lisp-union.h and
lisp-disunion.h about the use of the functions.
* lisp.h:
New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These
are different from the above in that the source is a void *
(previously, you had to use make_opaque_ptr()).
* eval.c (restore_lisp_object):
* eval.c (record_unwind_protect_restoring_lisp_object):
* eval.c (struct restore_int):
* eval.c (restore_int):
* eval.c (record_unwind_protect_restoring_int):
* eval.c (free_pointer):
* eval.c (record_unwind_protect_freeing):
* eval.c (free_dynarr):
* eval.c (record_unwind_protect_freeing_dynarr):
* eval.c (unbind_to_1):
Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the
use of make_opaque_ptr() and mostly eliminate Lisp consing
entirely in the use of these various record_unwind_protect_*
functions as well as internal_bind_* (e.g. internal_bind_int).
* tests.c:
* tests.c (Ftest_store_void_in_lisp):
* tests.c (syms_of_tests):
* tests.c (vars_of_tests):
Add an C-assert-style test to test STORE_VOID_IN_LISP and
GET_VOID_FROM_LISP to make sure the same value comes back that
was put in.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 06:42:16 -0600 |
| parents | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; symbol-syntax.el --- find chars with symbol syntax |
| 2 | |
| 3 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 | |
| 6 ;; Author: JBW, JBW@_CORTEZ | |
| 7 ;; Created: Wed Jun 20 15:15:34 1990 | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: matching | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 26 ;; Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ;;; Synched up with: Not in FSF. | |
| 29 | |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; Last modified by: Ben Wing, ben@xemacs.org | |
| 33 ;; Last modified on: Mon Oct 2 02:32:05 GMT 1995 | |
| 34 | |
| 35 ;;; Code: | |
| 36 | |
| 37 (defvar symbol-syntax-table-alist nil) | |
| 38 ;; '((c-mode-syntax-table) | |
| 39 ;; (emacs-lisp-mode-syntax-table) | |
| 40 ;; (lisp-mode-syntax-table) | |
| 41 ;; (text-mode-syntax-table))) | |
| 42 | |
| 43 (defun update-symbol-syntax-table-alist () | |
| 44 (let ((alist symbol-syntax-table-alist) | |
| 45 item) | |
| 46 (while (consp alist) | |
| 47 (cond ((null (car alist)) | |
| 48 (error "Missing alist item")) | |
| 49 ((null (car (car alist))) | |
| 50 (error "Alist item with null car")) | |
| 51 ;; this functionality not used | |
| 52 ((symbolp (setq item (car (car alist)))) | |
| 53 (or (null (cdr (car alist))) | |
| 54 (error "Alist item expected to have null cdr")) | |
| 55 (while (symbolp item) | |
| 56 (setq item (symbol-value item))) | |
| 57 (setcar (car alist) item))) | |
| 58 (cond ((not (syntax-table-p (car (car alist)))) | |
| 59 (error "Alist item car expected to be symbol table")) | |
| 60 ((null (cdr (car alist))) | |
| 61 (setcdr (car alist) | |
| 62 (make-symbol-syntax-table (car (car alist)))))) | |
| 63 (setq alist (cdr alist))))) | |
| 64 | |
| 65 (defun get-symbol-syntax-table (norm-table) | |
| 66 (let (result) | |
| 67 (if (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 68 nil | |
| 69 (update-symbol-syntax-table-alist) | |
| 70 (if (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 71 nil | |
| 72 (setq symbol-syntax-table-alist | |
| 73 (cons (list norm-table) | |
| 74 symbol-syntax-table-alist)) | |
| 75 (update-symbol-syntax-table-alist) | |
| 76 (or (setq result (assq norm-table symbol-syntax-table-alist)) | |
| 77 (error "Syntax table missing from symbol-syntax-table-alist")))) | |
| 78 (or (setq result (cdr result)) | |
| 79 (error "Alist item has null cdr")) | |
| 80 (or (syntax-table-p result) | |
| 81 (error "Non-syntax-table item in alist")) | |
| 82 result)) | |
| 83 | |
| 84 (defun make-symbol-syntax-table (in-table) | |
| 85 (let ((out-table (copy-syntax-table in-table))) | |
| 86 (map-syntax-table | |
| 87 #'(lambda (key value) | |
| 88 (if (eq ?_ (char-syntax-from-code value)) | |
| 89 (put-char-table key (set-char-syntax-in-code value ?w) | |
| 90 out-table)) | |
| 91 nil) | |
| 92 out-table) | |
| 93 out-table)) | |
| 94 | |
| 95 ;; stuff for examining contents of syntax tables | |
| 96 ;;(show-chars-with-syntax | |
| 97 ;; '(c-mode-syntax-table | |
| 98 ;; emacs-lisp-mode-syntax-table | |
| 99 ;; lisp-mode-syntax-table | |
| 100 ;; text-mode-syntax-table) | |
| 101 ;; ?_) | |
| 102 | |
| 103 (defun show-chars-with-syntax (tables syntax) | |
| 104 (let ((schars nil)) | |
| 105 (unwind-protect | |
| 106 (while (consp tables) | |
| 107 (let* ((chars nil) | |
| 108 (table-symbol (car tables)) | |
| 109 (table table-symbol)) | |
| 110 (or (symbolp table-symbol) | |
| 111 (error "bad argument non-symbol")) | |
| 112 (while (symbolp table) | |
| 113 (setq table (symbol-value table))) | |
| 114 (map-syntax-table | |
| 115 #'(lambda (key value) | |
| 116 (if (eq syntax (char-syntax-from-code value)) | |
| 117 (setq chars (cons key chars))) | |
| 118 nil) | |
| 119 table) | |
| 120 (setq schars (cons (list table-symbol (nreverse chars)) | |
| 121 schars))) | |
| 122 (setq tables (cdr tables)))) | |
| 123 (nreverse schars))) | |
| 124 | |
| 125 (provide 'symbol-syntax) | |
| 126 | |
| 127 ;;; symbol-syntax.el ends here |