Mercurial > hg > xemacs-beta
annotate lisp/alist.el @ 5307:c096d8051f89
Have NATNUMP give t for positive bignums; check limits appropriately.
src/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.c (Fexpand_abbrev):
* alloc.c:
* alloc.c (Fmake_list):
* alloc.c (Fmake_vector):
* alloc.c (Fmake_bit_vector):
* alloc.c (Fmake_byte_code):
* alloc.c (Fmake_string):
* alloc.c (vars_of_alloc):
* bytecode.c (UNUSED):
* bytecode.c (Fbyte_code):
* chartab.c (decode_char_table_range):
* cmds.c (Fself_insert_command):
* data.c (check_integer_range):
* data.c (Fnatnump):
* data.c (Fnonnegativep):
* data.c (Fstring_to_number):
* elhash.c (hash_table_size_validate):
* elhash.c (decode_hash_table_size):
* eval.c (Fbacktrace_frame):
* event-stream.c (lisp_number_to_milliseconds):
* event-stream.c (Faccept_process_output):
* event-stream.c (Frecent_keys):
* event-stream.c (Fdispatch_event):
* events.c (Fmake_event):
* events.c (Fevent_timestamp):
* events.c (Fevent_timestamp_lessp):
* events.h:
* events.h (struct command_builder):
* file-coding.c (gzip_putprop):
* fns.c:
* fns.c (check_sequence_range):
* fns.c (Frandom):
* fns.c (Fnthcdr):
* fns.c (Flast):
* fns.c (Fnbutlast):
* fns.c (Fbutlast):
* fns.c (Fmember):
* fns.c (Ffill):
* fns.c (Freduce):
* fns.c (replace_string_range_1):
* fns.c (Freplace):
* font-mgr.c (Ffc_pattern_get):
* frame-msw.c (msprinter_set_frame_properties):
* glyphs.c (check_valid_xbm_inline):
* indent.c (Fmove_to_column):
* intl-win32.c (mswindows_multibyte_to_unicode_putprop):
* lisp.h:
* lisp.h (ARRAY_DIMENSION_LIMIT):
* lread.c (decode_mode_1):
* mule-ccl.c (ccl_get_compiled_code):
* number.h:
* process-unix.c (unix_open_multicast_group):
* process.c (Fset_process_window_size):
* profile.c (Fstart_profiling):
* unicode.c (Funicode_to_char):
Change NATNUMP to return 1 for positive bignums; changes uses of
it and of CHECK_NATNUM appropriately, usually by checking for an
integer in an appropriate range.
Add array-dimension-limit and use it in #'make-vector,
#'make-string. Add array-total-size-limit, array-rank-limit while
we're at it, for the sake of any Common Lisp-oriented code that
uses these limits.
Rename check_int_range to check_integer_range, have it take
Lisp_Objects (and thus bignums) instead.
Remove bignum_butlast(), just set int_n to an appropriately large
integer if N is a bignum.
Accept bignums in check_sequence_range(), change the functions
that use check_sequence_range() appropriately.
Move the definition of NATNUMP() to number.h; document why it's a
reasonable name, contradicting an old comment.
tests/ChangeLog addition:
2010-11-20 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
* automated/lisp-tests.el (featurep):
* automated/lisp-tests.el (wrong-type-argument):
* automated/mule-tests.el (featurep):
Check for args-out-of-range errors instead of wrong-type-argument
errors in various places when code is handed a large bignum
instead of a fixnum.
Also check for the wrong-type-argument errors when giving the same
code a non-integer value.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 20 Nov 2010 16:49:11 +0000 |
| parents | 9e51b172d50f |
| children | b9167d522a9a |
| 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 | |
|
5289
9e51b172d50f
More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4783
diff
changeset
|
8 ;; This file is part of XEmacs. |
| 428 | 9 |
|
5289
9e51b172d50f
More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4783
diff
changeset
|
10 ;; XEmacs is free software; you can redistribute it and/or |
| 428 | 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 | |
|
5289
9e51b172d50f
More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4783
diff
changeset
|
15 ;; XEmacs is distributed in the hope that it will be useful, but |
| 428 | 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 |