Mercurial > hg > xemacs-beta
annotate lisp/alist.el @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 03 Feb 2010 20:51:18 -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 |