Mercurial > hg > xemacs-beta
annotate lisp/x-misc.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 | e29fcfd8df5f |
| children | d0bb90d90736 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-misc.el --- miscellaneous X functions. |
| 2 | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 ;; Copyright (C) 1995, 1996 Ben Wing. | |
| 6 | |
| 7 ;; Author: Ben Wing <ben@xemacs.org> | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: extensions, dumped | |
| 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, 59 Temple Place - Suite 330, | |
| 26 ;; Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs (when X support is compiled in). | |
| 31 | |
| 32 ;;; Code: | |
| 33 | |
| 502 | 34 (globally-declare-fboundp |
| 35 '(x-get-resource)) | |
| 36 | |
| 428 | 37 (defun x-bogosity-check-resource (name class type) |
| 38 "Check for a bogus resource specification." | |
| 39 (let ((bogus (x-get-resource | |
| 40 (concat "__no-such-friggin-locale__." name) | |
| 41 (concat "__No-such-friggin-widget__." class) | |
| 42 type 'global nil t))) | |
| 43 (if bogus | |
| 44 (display-warning | |
| 45 'resource | |
| 46 (format "Bad resource specification encountered: something like | |
| 47 Emacs*%s: %s | |
| 48 You should replace the * with a . in order to get proper behavior when | |
| 49 you use the specifier and/or `set-face-*' functions." name bogus))))) | |
| 50 | |
| 51 (defun x-init-specifier-from-resources (specifier type locale | |
| 52 &rest resource-list) | |
| 53 "Initialize a specifier from the resource database. | |
| 54 LOCALE specifies the locale that is to be initialized and should be | |
| 55 a frame, a device, or 'global. TYPE is the type of the resource and | |
| 56 should be one of 'string, 'boolean, 'integer, or 'natnum. The | |
| 57 remaining args should be conses of names and classes of resources | |
| 58 to be examined. The first resource with a value specified becomes | |
| 59 the spec for SPECIFIER in LOCALE. (However, if SPECIFIER already | |
| 60 has a spec in LOCALE, nothing is done.) Finally, if LOCALE is 'global, | |
| 61 a check is done for bogus resource specifications." | |
| 62 (if (eq locale 'global) | |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
63 (mapc #'(lambda (x) |
|
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
64 (x-bogosity-check-resource (car x) (cdr x) type)) |
|
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
502
diff
changeset
|
65 resource-list)) |
| 428 | 66 (if (not (specifier-spec-list specifier locale)) |
| 67 (catch 'done | |
| 68 (while resource-list | |
| 69 (let* ((name (caar resource-list)) | |
| 70 (class (cdar resource-list)) | |
| 71 (resource | |
| 442 | 72 (x-get-resource name class type locale nil 'warn))) |
| 428 | 73 (if resource |
| 74 (progn | |
| 75 (add-spec-to-specifier specifier resource locale) | |
| 76 (throw 'done t)))) | |
| 77 (setq resource-list (cdr resource-list)))))) | |
| 78 | |
| 79 (defun x-get-resource-and-bogosity-check (name class type &optional locale) | |
| 80 (x-bogosity-check-resource name class type) | |
| 442 | 81 (x-get-resource name class type locale nil 'warn)) |
| 428 | 82 |
| 83 (defun x-get-resource-and-maybe-bogosity-check (name class type &optional | |
| 84 locale) | |
| 85 (if (eq locale 'global) | |
| 86 (x-bogosity-check-resource name class type)) | |
| 442 | 87 (x-get-resource name class type locale nil 'warn)) |
| 428 | 88 |
| 89 ;;; x-misc.el ends here |