Mercurial > hg > xemacs-beta
annotate lisp/alist.el @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 20 Jan 2010 07:05:57 -0600 |
| parents | e29fcfd8df5f |
| children | 9e51b172d50f 91b3aa59f49b |
| rev | line source |
|---|---|
| 428 | 1 ;;; alist.el --- utility functions about association-list |
| 2 | |
| 3 ;; Copyright (C) 1993,1994,1995,1996,1998 Free Software Foundation, Inc. | |
| 4 | |
| 5 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp> | |
| 6 ;; Keywords: alist | |
| 7 | |
| 8 ;; This file is part of APEL (A Portable Emacs Library). | |
| 9 | |
| 10 ;; This program is free software; you can redistribute it and/or | |
| 11 ;; modify it under the terms of the GNU General Public License as | |
| 12 ;; published by the Free Software Foundation; either version 2, or (at | |
| 13 ;; your option) any later version. | |
| 14 | |
| 15 ;; This program is distributed in the hope that it will be useful, but | |
| 16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 18 ;; General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 613 | 21 ;; along with XEmacs; see the file COPYING. If not, write to the |
| 428 | 22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
| 23 ;; Boston, MA 02111-1307, USA. | |
| 24 | |
| 442 | 25 |
| 26 ;;;###autoload | |
| 27 (defun vassoc (key valist) | |
| 28 "Search VALIST for a vector whose first element is equal to KEY. | |
| 29 See also `assoc'." | |
| 30 ;; by Stig@hackvan.com | |
| 31 (let (el) | |
| 32 (catch 'done | |
| 33 (while (setq el (pop valist)) | |
| 34 (and (equal key (aref el 0)) | |
| 35 (throw 'done el)))))) | |
| 36 | |
| 428 | 37 |
| 38 ;;;###autoload | |
| 39 (defun put-alist (item value alist) | |
| 40 "Modify ALIST to set VALUE to ITEM. | |
| 41 If there is a pair whose car is ITEM, replace its cdr by VALUE. | |
| 42 If there is not such pair, create new pair (ITEM . VALUE) and | |
| 43 return new alist whose car is the new pair and cdr is ALIST. | |
| 44 \[tomo's ELIS like function]" | |
| 45 (let ((pair (assoc item alist))) | |
| 46 (if pair | |
| 47 (progn | |
| 48 (setcdr pair value) | |
| 49 alist) | |
| 50 (cons (cons item value) alist) | |
| 51 ))) | |
| 52 | |
| 53 ;;;###autoload | |
| 54 (defun del-alist (item alist) | |
| 55 "If there is a pair whose key is ITEM, delete it from ALIST. | |
| 56 \[tomo's ELIS emulating function]" | |
| 57 (if (equal item (car (car alist))) | |
| 58 (cdr alist) | |
| 59 (let ((pr alist) | |
| 60 (r (cdr alist)) | |
| 61 ) | |
| 62 (catch 'tag | |
| 63 (while (not (null r)) | |
| 64 (if (equal item (car (car r))) | |
| 65 (progn | |
| 66 (rplacd pr (cdr r)) | |
| 67 (throw 'tag alist))) | |
| 68 (setq pr r) | |
| 69 (setq r (cdr r)) | |
| 70 ) | |
| 71 alist)))) | |
| 72 | |
| 73 ;;;###autoload | |
| 74 (defun set-alist (symbol item value) | |
| 75 "Modify a alist indicated by SYMBOL to set VALUE to ITEM." | |
| 76 (or (boundp symbol) | |
| 77 (set symbol nil) | |
| 78 ) | |
| 79 (set symbol (put-alist item value (symbol-value symbol))) | |
| 80 ) | |
| 81 | |
| 82 ;;;###autoload | |
| 83 (defun remove-alist (symbol item) | |
| 84 "Remove ITEM from the alist indicated by SYMBOL." | |
| 85 (and (boundp symbol) | |
| 86 (set symbol (del-alist item (symbol-value symbol))) | |
| 87 )) | |
| 88 | |
| 89 ;;;###autoload | |
| 90 (defun modify-alist (modifier default) | |
| 91 "Modify alist DEFAULT into alist MODIFIER." | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
613
diff
changeset
|
92 (mapc |
|
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
613
diff
changeset
|
93 (function |
|
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
613
diff
changeset
|
94 (lambda (as) |
|
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
613
diff
changeset
|
95 (setq default (put-alist (car as)(cdr as) default)))) |
|
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
613
diff
changeset
|
96 modifier) |
| 428 | 97 default) |
| 98 | |
| 99 ;;;###autoload | |
| 100 (defun set-modified-alist (sym modifier) | |
| 101 "Modify a value of a symbol SYM into alist MODIFIER. | |
| 102 The symbol SYM should be alist. If it is not bound, | |
| 103 its value regard as nil." | |
| 104 (if (not (boundp sym)) | |
| 105 (set sym nil) | |
| 106 ) | |
| 107 (set sym (modify-alist modifier (eval sym))) | |
| 108 ) | |
| 109 | |
| 110 | |
| 111 ;;; @ end | |
| 112 ;;; | |
| 113 | |
| 114 (provide 'alist) | |
| 115 | |
| 116 ;;; alist.el ends here |