Mercurial > hg > xemacs-beta
annotate lisp/cl.el @ 5462:97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
lisp/ChangeLog addition:
2011-04-24 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (symbol-macrolet):
* cl-macs.el (lexical-let):
* cl.el:
* cl.el (cl-macroexpand):
Distinct symbol macros with identical string names should
nonetheless expand to different things; implement this, storing
the symbol's eq-hash in the macro environment, rather than its
string name.
tests/ChangeLog addition:
2011-04-24 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Check that distinct symbol macros with identical string names
expand to different things.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 24 Apr 2011 09:52:45 +0100 |
parents | 25c10648ffba |
children | f2881cb841b4 |
rev | line source |
---|---|
613 | 1 ;;; cl.el --- Common Lisp extensions for XEmacs Lisp |
428 | 2 |
3 ;; Copyright (C) 1993, 1997 Free Software Foundation, Inc. | |
5066
545ec923b4eb
add documentation on keywords to cl*.el
Ben Wing <ben@xemacs.org>
parents:
4995
diff
changeset
|
4 ;; Copyright (C) 2010 Ben Wing. |
428 | 5 |
6 ;; Author: Dave Gillespie <daveg@synaptics.com> | |
7 ;; Maintainer: XEmacs Development Team | |
8 ;; Version: 2.02 | |
9 ;; Keywords: extensions, dumped, lisp | |
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 Free | |
25 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
26 ;; 02111-1307, USA. | |
27 | |
2153 | 28 ;;; Synched up with: FSF 21.3. |
428 | 29 |
30 ;;; Commentary: | |
31 | |
32 ;; This file is dumped with XEmacs. | |
33 | |
34 ;; These are extensions to Emacs Lisp that provide a degree of | |
35 ;; Common Lisp compatibility, beyond what is already built-in | |
36 ;; in Emacs Lisp. | |
37 ;; | |
38 ;; This package was written by Dave Gillespie; it is a complete | |
39 ;; rewrite of Cesar Quiroz's original cl.el package of December 1986. | |
40 ;; | |
41 ;; Bug reports, comments, and suggestions are welcome! | |
42 | |
43 ;; This file contains the portions of the Common Lisp extensions | |
44 ;; package which should always be present. | |
45 | |
46 | |
47 ;;; Future notes: | |
48 | |
49 ;; Once Emacs 19 becomes standard, many things in this package which are | |
50 ;; messy for reasons of compatibility can be greatly simplified. For now, | |
51 ;; I prefer to maintain one unified version. | |
52 | |
53 | |
54 ;;; Change Log: | |
55 | |
56 ;; Version 2.02 (30 Jul 93): | |
57 ;; * Added "cl-compat.el" file, extra compatibility with old package. | |
58 ;; * Added `lexical-let' and `lexical-let*'. | |
59 ;; * Added `define-modify-macro', `callf', and `callf2'. | |
60 ;; * Added `ignore-errors'. | |
61 ;; * Changed `(setf (nthcdr N PLACE) X)' to work when N is zero. | |
62 ;; * Merged `*gentemp-counter*' into `*gensym-counter*'. | |
63 ;; * Extended `subseq' to allow negative START and END like `substring'. | |
64 ;; * Added `in-ref', `across-ref', `elements of-ref' loop clauses. | |
65 ;; * Added `concat', `vconcat' loop clauses. | |
66 ;; * Cleaned up a number of compiler warnings. | |
67 | |
68 ;; Version 2.01 (7 Jul 93): | |
69 ;; * Added support for FSF version of Emacs 19. | |
70 ;; * Added `add-hook' for Emacs 18 users. | |
71 ;; * Added `defsubst*' and `symbol-macrolet'. | |
72 ;; * Added `maplist', `mapc', `mapl', `mapcan', `mapcon'. | |
73 ;; * Added `map', `concatenate', `reduce', `merge'. | |
74 ;; * Added `revappend', `nreconc', `tailp', `tree-equal'. | |
75 ;; * Added `assert', `check-type', `typecase', `typep', and `deftype'. | |
76 ;; * Added destructuring and `&environment' support to `defmacro*'. | |
77 ;; * Added destructuring to `loop', and added the following clauses: | |
78 ;; `elements', `frames', `overlays', `intervals', `buffers', `key-seqs'. | |
79 ;; * Renamed `delete' to `delete*' and `remove' to `remove*'. | |
80 ;; * Completed support for all keywords in `remove*', `substitute', etc. | |
81 ;; * Added `most-positive-float' and company. | |
82 ;; * Fixed hash tables to work with latest Lucid Emacs. | |
83 ;; * `proclaim' forms are no longer compile-time-evaluating; use `declaim'. | |
84 ;; * Syntax for `warn' declarations has changed. | |
85 ;; * Improved implementation of `random*'. | |
86 ;; * Moved most sequence functions to a new file, cl-seq.el. | |
87 ;; * Moved `eval-when' into cl-macs.el. | |
88 ;; * Moved `pushnew' and `adjoin' to cl.el for most common cases. | |
89 ;; * Moved `provide' forms down to ends of files. | |
90 ;; * Changed expansion of `pop' to something that compiles to better code. | |
91 ;; * Changed so that no patch is required for Emacs 19 byte compiler. | |
92 ;; * Made more things dependent on `optimize' declarations. | |
93 ;; * Added a partial implementation of struct print functions. | |
94 ;; * Miscellaneous minor changes. | |
95 | |
96 ;; Version 2.00: | |
97 ;; * First public release of this package. | |
98 | |
99 | |
100 ;;; Code: | |
101 | |
102 (defvar cl-optimize-speed 1) | |
103 (defvar cl-optimize-safety 1) | |
104 | |
105 (defvar custom-print-functions nil | |
106 "This is a list of functions that format user objects for printing. | |
107 Each function is called in turn with three arguments: the object, the | |
108 stream, and the print level (currently ignored). If it is able to | |
109 print the object it returns true; otherwise it returns nil and the | |
110 printer proceeds to the next function on the list. | |
111 | |
112 This variable is not used at present, but it is defined in hopes that | |
113 a future Emacs interpreter will be able to use it.") | |
114 | |
115 ;;; Predicates. | |
116 | |
117 (defun eql (a b) ; See compiler macro in cl-macs.el | |
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
118 "Return t if the arguments are the same Lisp object, or numerically equal. |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
119 |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
120 They must be of the same type; the difference between `eq' and `eql' is most |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
121 relevant when it comes to the non-fixnum number types. In this |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
122 implementation, fixnums of the same numeric value are always `eq', but this |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
123 is not true for other numeric types, among them floats, bignums and ratios, |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
124 if available. |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
125 |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
126 See also `=' (which doesn't require that its arguments be of the same type, |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
127 but only accepts numeric arguments, characters and markers) and `equal'." |
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
128 (or (eq a b) (and (numberp a) (equal a b)))) |
428 | 129 |
130 ;;; Generalized variables. These macros are defined here so that they | |
131 ;;; can safely be used in .emacs files. | |
132 | |
133 (defmacro incf (place &optional x) | |
3343 | 134 "Increment PLACE by X (1 by default). |
428 | 135 PLACE may be a symbol, or any generalized variable allowed by `setf'. |
136 The return value is the incremented value of PLACE." | |
137 (if (symbolp place) | |
138 (list 'setq place (if x (list '+ place x) (list '1+ place))) | |
139 ;; XEmacs byte-compiler optimizes (+ FOO 1) to (1+ FOO), so this | |
140 ;; is OK. | |
141 (list 'callf '+ place (or x 1)))) | |
142 | |
143 (defmacro decf (place &optional x) | |
3343 | 144 "Decrement PLACE by X (1 by default). |
428 | 145 PLACE may be a symbol, or any generalized variable allowed by `setf'. |
146 The return value is the decremented value of PLACE." | |
147 (if (symbolp place) | |
148 (list 'setq place (if x (list '- place x) (list '1- place))) | |
149 (list 'callf '- place (or x 1)))) | |
150 | |
151 (defmacro pop (place) | |
3343 | 152 "Remove and return the head of the list stored in PLACE. |
428 | 153 Analogous to (prog1 (car PLACE) (setf PLACE (cdr PLACE))), though more |
154 careful about evaluating each argument only once and in the right order. | |
155 PLACE may be a symbol, or any generalized variable allowed by `setf'." | |
156 (if (symbolp place) | |
157 `(car (prog1 ,place (setq ,place (cdr ,place)))) | |
158 (cl-do-pop place))) | |
159 | |
3343 | 160 (defmacro push (newelt listname) |
3355 | 161 "Add NEWELT at the beginning of the list stored in LISTNAME. |
162 Analogous to (setf LISTNAME (cons NEWELT LISTNAME)), though more careful | |
163 about evaluating each argument only once and in the right order. LISTNAME | |
164 may be a symbol, or any generalized variable allowed by `setf'; that is, it | |
165 does not necessarily have to be a list, though `push' is most often used on | |
166 lists. " | |
3343 | 167 (if (symbolp listname) `(setq ,listname (cons ,newelt ,listname)) |
168 (list 'callf2 'cons newelt listname))) | |
428 | 169 |
3343 | 170 (defmacro pushnew (newelt listname &rest keys) |
3355 | 171 "Add NEWELT at the beginning of LISTNAME, unless it's already in LISTNAME. |
3343 | 172 Like (push NEWELT LISTNAME), except that the list is unmodified if NEWELT is |
173 `eql' to an element already on the list. | |
5066
545ec923b4eb
add documentation on keywords to cl*.el
Ben Wing <ben@xemacs.org>
parents:
4995
diff
changeset
|
174 Keywords supported: :test :test-not :key |
545ec923b4eb
add documentation on keywords to cl*.el
Ben Wing <ben@xemacs.org>
parents:
4995
diff
changeset
|
175 See `member*' for the meaning of :test, :test-not and :key." |
3343 | 176 (if (symbolp listname) (list 'setq listname |
177 (list* 'adjoin newelt listname keys)) | |
178 (list* 'callf2 'adjoin newelt listname keys))) | |
428 | 179 |
180 (defun cl-set-elt (seq n val) | |
181 (if (listp seq) (setcar (nthcdr n seq) val) (aset seq n val))) | |
182 | |
183 (defun cl-set-nthcdr (n list x) | |
184 (if (<= n 0) x (setcdr (nthcdr (1- n) list) x) list)) | |
185 | |
186 (defun cl-set-buffer-substring (start end val) | |
187 (save-excursion (delete-region start end) | |
188 (goto-char start) | |
189 (insert val) | |
190 val)) | |
191 | |
192 (defun cl-set-substring (str start end val) | |
193 (if end (if (< end 0) (incf end (length str))) | |
194 (setq end (length str))) | |
2136 | 195 (if (< start 0) (incf start (length str))) |
428 | 196 (concat (and (> start 0) (substring str 0 start)) |
197 val | |
198 (and (< end (length str)) (substring str end)))) | |
199 | |
200 ;;; Control structures. | |
201 | |
202 ;; The macros `when' and `unless' are so useful that we want them to | |
203 ;; ALWAYS be available. So they've been moved from cl.el to eval.c. | |
204 ;; Note: FSF Emacs moved them to subr.el in FSF 20. | |
205 | |
2153 | 206 (defalias 'cl-map-extents 'map-extents) |
428 | 207 |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
208 ;;; XEmacs; multiple values are in eval.c and cl-macs.el. |
2153 | 209 |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
210 ;;; We no longer support `multiple-value-apply', which was ill-conceived to |
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
211 ;;; start with, is not specified by Common Lisp, and which nothing uses, |
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
212 ;;; according to Google Code Search, as of Sat Mar 14 23:31:35 GMT 2009. |
2153 | 213 |
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
214 (make-obsolete 'multiple-value-apply 'multiple-value-call) |
428 | 215 |
216 ;;; Macros. | |
217 | |
218 (defvar cl-macro-environment nil) | |
219 ;; XEmacs: we renamed the internal function to macroexpand-internal | |
220 ;; to avoid doc-file problems. | |
221 (defvar cl-old-macroexpand (prog1 (symbol-function 'macroexpand-internal) | |
222 (defalias 'macroexpand 'cl-macroexpand))) | |
223 | |
224 (defun cl-macroexpand (cl-macro &optional cl-env) | |
225 "Return result of expanding macros at top level of FORM. | |
226 If FORM is not a macro call, it is returned unchanged. | |
227 Otherwise, the macro is expanded and the expansion is considered | |
228 in place of FORM. When a non-macro-call results, it is returned. | |
229 | |
442 | 230 The second optional arg ENVIRONMENT specifies an environment of macro |
428 | 231 definitions to shadow the loaded ones for use in file byte-compilation." |
5462
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
232 (let ((cl-macro-environment |
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
233 (if cl-macro-environment (append cl-env cl-macro-environment) cl-env)) |
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
234 eq-hash) |
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
235 (while (progn (setq cl-macro |
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
236 (macroexpand-internal cl-macro cl-macro-environment)) |
428 | 237 (and (symbolp cl-macro) |
5462
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
238 (setq eq-hash (eq-hash cl-macro)) |
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
239 (if (fixnump eq-hash) |
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
240 (assq eq-hash cl-macro-environment) |
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
241 (assoc eq-hash cl-macro-environment)))) |
97ac18bd1fa3
Make sure distinct symbol macros with identical names expand distinctly.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5392
diff
changeset
|
242 (setq cl-macro (cadr (assoc* eq-hash cl-macro-environment)))) |
428 | 243 cl-macro)) |
244 | |
245 ;;; Declarations. | |
246 | |
247 (defvar cl-compiling-file nil) | |
248 (defun cl-compiling-file () | |
249 (or cl-compiling-file | |
250 ;; XEmacs change | |
251 ; (and (boundp 'outbuffer) (bufferp (symbol-value 'outbuffer)) | |
252 ; (equal (buffer-name (symbol-value 'outbuffer)) | |
253 ; " *Compiler Output*")) | |
254 (and (boundp 'byte-compile-outbuffer) | |
255 (bufferp (symbol-value 'byte-compile-outbuffer)) | |
256 (equal (buffer-name (symbol-value 'byte-compile-outbuffer)) | |
257 " *Compiler Output*")) | |
258 )) | |
259 | |
260 (defvar cl-proclaims-deferred nil) | |
261 | |
262 (defun proclaim (spec) | |
263 (if (fboundp 'cl-do-proclaim) (cl-do-proclaim spec t) | |
264 (push spec cl-proclaims-deferred)) | |
265 nil) | |
266 | |
267 (defmacro declaim (&rest specs) | |
268 (let ((body (mapcar (function (lambda (x) (list 'proclaim (list 'quote x)))) | |
269 specs))) | |
270 (if (cl-compiling-file) (list* 'eval-when '(compile load eval) body) | |
271 (cons 'progn body)))) ; avoid loading cl-macs.el for eval-when | |
272 | |
273 ;;; Symbols. | |
274 | |
275 (defun cl-random-time () | |
276 (let* ((time (copy-sequence (current-time-string))) (i (length time)) (v 0)) | |
277 (while (>= (decf i) 0) (setq v (+ (* v 3) (aref time i)))) | |
2509 | 278 (if-fboundp 'coerce-number |
279 (coerce-number v 'fixnum) | |
1983 | 280 v))) |
428 | 281 |
282 (defvar *gensym-counter* (* (logand (cl-random-time) 1023) 100)) | |
283 | |
2153 | 284 ;; XEmacs change: gensym and gentemp moved here from cl-macs.el |
442 | 285 (defun gensym (&optional arg) |
286 "Generate a new uninterned symbol. | |
2071 | 287 The name is made by appending a number to a prefix. If ARG is a string, it |
288 is the prefix, otherwise the prefix defaults to \"G\". If ARG is an integer, | |
289 the internal counter is reset to that number before creating the name. | |
290 There is no way to specify both using this function." | |
442 | 291 (let ((prefix (if (stringp arg) arg "G")) |
292 (num (if (integerp arg) arg | |
293 (prog1 *gensym-counter* | |
294 (setq *gensym-counter* (1+ *gensym-counter*)))))) | |
295 (make-symbol (format "%s%d" prefix num)))) | |
296 | |
297 (defun gentemp (&optional arg) | |
298 "Generate a new interned symbol with a unique name. | |
2071 | 299 The name is made by appending a number to ARG, default \"G\". |
300 If ARG is not a string, it is ignored." | |
442 | 301 (let ((prefix (if (stringp arg) arg "G")) |
302 name) | |
303 (while (intern-soft (setq name (format "%s%d" prefix *gensym-counter*))) | |
304 (setq *gensym-counter* (1+ *gensym-counter*))) | |
305 (intern name))) | |
428 | 306 |
307 ;;; Numbers. | |
308 | |
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
309 ;; XEmacs change: ditch floatp-safe. |
428 | 310 |
446 | 311 (defun plusp (number) |
428 | 312 "Return t if NUMBER is positive." |
446 | 313 (> number 0)) |
314 | |
315 (defun minusp (number) | |
316 "Return t if NUMBER is negative." | |
317 (< number 0)) | |
428 | 318 |
446 | 319 (defun oddp (integer) |
428 | 320 "Return t if INTEGER is odd." |
5385
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
321 (eql (logand integer 1) 1)) |
428 | 322 |
446 | 323 (defun evenp (integer) |
428 | 324 "Return t if INTEGER is even." |
5385
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
325 (eql (logand integer 1) 0)) |
428 | 326 |
2153 | 327 ;; XEmacs addition |
328 (defalias 'cl-abs 'abs) | |
428 | 329 |
330 (defvar *random-state* (vector 'cl-random-state-tag -1 30 (cl-random-time))) | |
331 | |
332 ;;; The following are set by code in cl-extra.el | |
333 (defconst most-positive-float nil | |
334 "The float closest in value to positive infinity.") | |
335 (defconst most-negative-float nil | |
336 "The float closest in value to negative infinity.") | |
337 (defconst least-positive-float nil | |
5385
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
338 "The positive float closest in value to zero.") |
428 | 339 (defconst least-negative-float nil |
5385
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
340 "The negative float closest in value to zero.") |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
341 (defconst least-positive-normalized-float nil |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
342 "The normalized positive float closest in value to zero. |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
343 |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
344 A float is normalized if the most significant bit of its mantissa is 1. |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
345 Use of denormalized (equivalently, subnormal) floats in calculations will |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
346 lead to gradual underflow, though they can be more accurate in representing |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
347 individual small values. Normal and subnormal floats are as described in |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
348 IEEE 754.") |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
349 |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
350 (defconst least-negative-normalized-float nil |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
351 "The normalized negative float closest in value to zero. |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
352 |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
353 See `least-positive-normalized-float' for details of normal and denormalized |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
354 numbers.") |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
355 |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
356 (defconst float-epsilon nil |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
357 "The smallest float guaranteed not `eql' to 1.0 when added to 1.0. |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
358 |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
359 That is, (eql 1.0 (+ 1.0 X)) will always give nil if (<= float-epsilon X) , |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
360 but it may give t for smaller values.") |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
361 |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
362 (defconst float-negative-epsilon nil |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
363 "The smallest float guaranteed not `eql' to 1.0 when subtracted from 1.0. |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
364 |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
365 That is, (eql 1.0 (- 1.0 X)) will always give nil if (<= |
436e67ca8c79
Give docstrings to least-{positive,negative}-normalized-float, float-*epsilon
Aidan Kehoe <kehoea@parhasard.net>
parents:
5354
diff
changeset
|
366 float-negative-epsilon X) , but it may give t for smaller values.") |
428 | 367 |
368 ;;; Sequence functions. | |
369 | |
370 (defalias 'copy-seq 'copy-sequence) | |
371 | |
5219
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
372 ;; XEmacs; #'mapcar* is in C. |
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
373 |
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
374 (defalias 'svref 'aref) ;; Compiler macro in cl-macs.el |
428 | 375 |
376 ;;; List functions. | |
377 | |
378 ;; These functions are made known to the byte-compiler by cl-macs.el | |
379 ;; and turned into efficient car and cdr bytecodes. | |
380 | |
381 (defalias 'first 'car) | |
382 (defalias 'rest 'cdr) | |
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
383 |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
384 ;; XEmacs change; this needs to error if handed a non-list. |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
385 (defun endp (list) |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
386 "Return t if LIST is nil, or nil if LIST is a cons. Error otherwise." |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
387 (prog1 |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
388 (null list) |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
389 (and list (atom list) (error 'wrong-type-argument #'listp list)))) |
428 | 390 |
2153 | 391 ;; XEmacs change: make it a real function |
428 | 392 (defun second (x) |
393 "Return the second element of the list LIST." | |
394 (car (cdr x))) | |
395 | |
396 (defun third (x) | |
2153 | 397 "Return the third element of the list X." |
428 | 398 (car (cdr (cdr x)))) |
399 | |
400 (defun fourth (x) | |
2153 | 401 "Return the fourth element of the list X." |
428 | 402 (nth 3 x)) |
403 | |
404 (defun fifth (x) | |
2153 | 405 "Return the fifth element of the list X." |
428 | 406 (nth 4 x)) |
407 | |
408 (defun sixth (x) | |
2153 | 409 "Return the sixth element of the list X." |
428 | 410 (nth 5 x)) |
411 | |
412 (defun seventh (x) | |
2153 | 413 "Return the seventh element of the list X." |
428 | 414 (nth 6 x)) |
415 | |
416 (defun eighth (x) | |
2153 | 417 "Return the eighth element of the list X." |
428 | 418 (nth 7 x)) |
419 | |
420 (defun ninth (x) | |
2153 | 421 "Return the ninth element of the list X." |
428 | 422 (nth 8 x)) |
423 | |
424 (defun tenth (x) | |
2153 | 425 "Return the tenth element of the list X." |
428 | 426 (nth 9 x)) |
427 | |
2153 | 428 ;; XEmacs change: Emacs defines caar, cadr, cdar, and cddr in subr.el. |
428 | 429 (defun caar (x) |
430 "Return the `car' of the `car' of X." | |
431 (car (car x))) | |
432 | |
433 (defun cadr (x) | |
5392
25c10648ffba
#'cadr, #'caddr, #'cadddr; document some equivalences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5385
diff
changeset
|
434 "Return the `car' of the `cdr' of X. Equivalent to `(second X)'." |
428 | 435 (car (cdr x))) |
436 | |
437 (defun cdar (x) | |
438 "Return the `cdr' of the `car' of X." | |
439 (cdr (car x))) | |
440 | |
441 (defun cddr (x) | |
442 "Return the `cdr' of the `cdr' of X." | |
443 (cdr (cdr x))) | |
444 | |
445 (defun caaar (x) | |
446 "Return the `car' of the `car' of the `car' of X." | |
447 (car (car (car x)))) | |
448 | |
449 (defun caadr (x) | |
450 "Return the `car' of the `car' of the `cdr' of X." | |
451 (car (car (cdr x)))) | |
452 | |
453 (defun cadar (x) | |
454 "Return the `car' of the `cdr' of the `car' of X." | |
455 (car (cdr (car x)))) | |
456 | |
457 (defun caddr (x) | |
5392
25c10648ffba
#'cadr, #'caddr, #'cadddr; document some equivalences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5385
diff
changeset
|
458 "Return the `car' of the `cdr' of the `cdr' of X. |
25c10648ffba
#'cadr, #'caddr, #'cadddr; document some equivalences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5385
diff
changeset
|
459 Equivalent to `(third X)'." |
428 | 460 (car (cdr (cdr x)))) |
461 | |
462 (defun cdaar (x) | |
463 "Return the `cdr' of the `car' of the `car' of X." | |
464 (cdr (car (car x)))) | |
465 | |
466 (defun cdadr (x) | |
467 "Return the `cdr' of the `car' of the `cdr' of X." | |
468 (cdr (car (cdr x)))) | |
469 | |
470 (defun cddar (x) | |
471 "Return the `cdr' of the `cdr' of the `car' of X." | |
472 (cdr (cdr (car x)))) | |
473 | |
474 (defun cdddr (x) | |
475 "Return the `cdr' of the `cdr' of the `cdr' of X." | |
476 (cdr (cdr (cdr x)))) | |
477 | |
478 (defun caaaar (x) | |
479 "Return the `car' of the `car' of the `car' of the `car' of X." | |
480 (car (car (car (car x))))) | |
481 | |
482 (defun caaadr (x) | |
483 "Return the `car' of the `car' of the `car' of the `cdr' of X." | |
484 (car (car (car (cdr x))))) | |
485 | |
486 (defun caadar (x) | |
487 "Return the `car' of the `car' of the `cdr' of the `car' of X." | |
488 (car (car (cdr (car x))))) | |
489 | |
490 (defun caaddr (x) | |
491 "Return the `car' of the `car' of the `cdr' of the `cdr' of X." | |
492 (car (car (cdr (cdr x))))) | |
493 | |
494 (defun cadaar (x) | |
495 "Return the `car' of the `cdr' of the `car' of the `car' of X." | |
496 (car (cdr (car (car x))))) | |
497 | |
498 (defun cadadr (x) | |
499 "Return the `car' of the `cdr' of the `car' of the `cdr' of X." | |
500 (car (cdr (car (cdr x))))) | |
501 | |
502 (defun caddar (x) | |
503 "Return the `car' of the `cdr' of the `cdr' of the `car' of X." | |
504 (car (cdr (cdr (car x))))) | |
505 | |
506 (defun cadddr (x) | |
5392
25c10648ffba
#'cadr, #'caddr, #'cadddr; document some equivalences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5385
diff
changeset
|
507 "Return the `car' of the `cdr' of the `cdr' of the `cdr' of X. |
25c10648ffba
#'cadr, #'caddr, #'cadddr; document some equivalences.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5385
diff
changeset
|
508 Equivalent to `(fourth X)'." |
428 | 509 (car (cdr (cdr (cdr x))))) |
510 | |
511 (defun cdaaar (x) | |
512 "Return the `cdr' of the `car' of the `car' of the `car' of X." | |
513 (cdr (car (car (car x))))) | |
514 | |
515 (defun cdaadr (x) | |
516 "Return the `cdr' of the `car' of the `car' of the `cdr' of X." | |
517 (cdr (car (car (cdr x))))) | |
518 | |
519 (defun cdadar (x) | |
520 "Return the `cdr' of the `car' of the `cdr' of the `car' of X." | |
521 (cdr (car (cdr (car x))))) | |
522 | |
523 (defun cdaddr (x) | |
524 "Return the `cdr' of the `car' of the `cdr' of the `cdr' of X." | |
525 (cdr (car (cdr (cdr x))))) | |
526 | |
527 (defun cddaar (x) | |
528 "Return the `cdr' of the `cdr' of the `car' of the `car' of X." | |
529 (cdr (cdr (car (car x))))) | |
530 | |
531 (defun cddadr (x) | |
532 "Return the `cdr' of the `cdr' of the `car' of the `cdr' of X." | |
533 (cdr (cdr (car (cdr x))))) | |
534 | |
535 (defun cdddar (x) | |
536 "Return the `cdr' of the `cdr' of the `cdr' of the `car' of X." | |
537 (cdr (cdr (cdr (car x))))) | |
538 | |
539 (defun cddddr (x) | |
540 "Return the `cdr' of the `cdr' of the `cdr' of the `cdr' of X." | |
541 (cdr (cdr (cdr (cdr x))))) | |
542 | |
543 ;;; `last' is implemented as a C primitive, as of 1998-11 | |
544 | |
5281
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
545 ;;; XEmacs: `list*' is in subr.el. |
428 | 546 |
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
547 ;; XEmacs; handle dotted lists properly, error on circularity and if LIST is |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
548 ;; not a list. |
428 | 549 (defun ldiff (list sublist) |
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
550 "Return a copy of LIST with the tail SUBLIST removed. |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
551 |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
552 If SUBLIST is the same Lisp object as LIST, return nil. If SUBLIST is |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
553 not present in the list structure of LIST (that is, it is not the cdr |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
554 of some cons making up LIST), this function is equivalent to |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
555 `copy-list'. LIST may be dotted." |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
556 (check-argument-type #'listp list) |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
557 (and list (not (eq list sublist)) |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
558 (let ((before list) (evenp t) result) |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
559 (prog1 |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
560 (setq result (list (car list))) |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
561 (while (and (setq list (cdr-safe list)) (not (eql list sublist))) |
5294
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
562 (setcdr result (if (consp list) (list (car list)) list)) |
bbff29a01820
Add compiler macros and compilation sanity-checks for functions with keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5285
diff
changeset
|
563 (setq result (cdr result) |
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
564 evenp (not evenp)) |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
565 (if evenp (setq before (cdr before))) |
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
566 (if (eq before list) (error 'circular-list list))))))) |
428 | 567 |
568 ;;; `copy-list' is implemented as a C primitive, as of 1998-11 | |
569 | |
570 (defalias 'cl-member 'memq) ; for compatibility with old CL package | |
571 (defalias 'cl-floor 'floor*) | |
572 (defalias 'cl-ceiling 'ceiling*) | |
573 (defalias 'cl-truncate 'truncate*) | |
574 (defalias 'cl-round 'round*) | |
575 (defalias 'cl-mod 'mod*) | |
576 | |
5354
22c4e67a2e69
Remove #'acons from cl.el, make the version in alloc.c visible to Lisp
Aidan Kehoe <kehoea@parhasard.net>
parents:
5353
diff
changeset
|
577 ;;; XEmacs; #'acons is in C. |
428 | 578 |
5219
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
579 (defun pairlis (keys values &optional alist) |
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
580 "Make an alist from KEYS and VALUES. |
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
581 Return a new alist composed by associating KEYS to corresponding VALUES; |
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
582 the process stops as soon as KEYS or VALUES run out. |
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
583 If ALIST is non-nil, the new pairs are prepended to it." |
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
584 (nconc (mapcar* 'cons keys values) alist)) |
428 | 585 |
586 ;;; Miscellaneous. | |
587 | |
588 ;; XEmacs change | |
589 (define-error 'cl-assertion-failed "Assertion failed") | |
590 | |
5318
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
591 ;; XEmacs; provide a milquetoast amount of compatibility in our error symbols. |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
592 (define-error 'type-error "Wrong type" 'wrong-type-argument) |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
593 (define-error 'program-error "Error in your program" 'invalid-argument) |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
594 |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
595 (map-plist |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
596 #'(lambda (key value) |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
597 (mapc #'(lambda (error) |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
598 (put error 'error-conditions |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
599 (cons key (get error 'error-conditions)))) |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
600 value)) |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
601 '(program-error (wrong-number-of-arguments invalid-keyword-argument) |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
602 type-error (wrong-type-argument malformed-list circular-list))) |
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
603 |
2153 | 604 ;; XEmacs change: omit the autoload rules; we handle those a different way |
428 | 605 |
606 ;;; Define data for indentation and edebug. | |
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4885
diff
changeset
|
607 (mapc |
428 | 608 #'(lambda (entry) |
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4885
diff
changeset
|
609 (mapc |
428 | 610 #'(lambda (func) |
611 (put func 'lisp-indent-function (nth 1 entry)) | |
612 (put func 'lisp-indent-hook (nth 1 entry)) | |
613 (or (get func 'edebug-form-spec) | |
614 (put func 'edebug-form-spec (nth 2 entry)))) | |
615 (car entry))) | |
616 '(((defun* defmacro*) defun) | |
617 ((function*) nil | |
618 (&or symbolp ([&optional 'macro] 'lambda (&rest sexp) &rest form))) | |
619 ((eval-when) 1 (sexp &rest form)) | |
620 ((when unless) 1 (&rest form)) | |
621 ((declare) nil (&rest sexp)) | |
622 ((the) 1 (sexp &rest form)) | |
623 ((case ecase typecase etypecase) 1 (form &rest (sexp &rest form))) | |
624 ((block return-from) 1 (sexp &rest form)) | |
625 ((return) nil (&optional form)) | |
626 ((do do*) 2 ((&rest &or symbolp (symbolp &optional form form)) | |
627 (form &rest form) | |
628 &rest form)) | |
629 ((dolist dotimes) 1 ((symbolp form &rest form) &rest form)) | |
630 ((do-symbols) 1 ((symbolp form &optional form form) &rest form)) | |
631 ((do-all-symbols) 1 ((symbolp form &optional form) &rest form)) | |
632 ((psetq setf psetf) nil edebug-setq-form) | |
633 ((progv) 2 (&rest form)) | |
634 ((flet labels macrolet) 1 | |
635 ((&rest (sexp sexp &rest form)) &rest form)) | |
636 ((symbol-macrolet lexical-let lexical-let*) 1 | |
637 ((&rest &or symbolp (symbolp form)) &rest form)) | |
638 ((multiple-value-bind) 2 ((&rest symbolp) &rest form)) | |
639 ((multiple-value-setq) 1 ((&rest symbolp) &rest form)) | |
640 ((incf decf remf pop push pushnew shiftf rotatef) nil (&rest form)) | |
641 ((letf letf*) 1 ((&rest (&rest form)) &rest form)) | |
642 ((callf destructuring-bind) 2 (sexp form &rest form)) | |
643 ((callf2) 3 (sexp form form &rest form)) | |
644 ((loop) defun (&rest &or symbolp form)) | |
645 ((ignore-errors) 0 (&rest form)))) | |
646 | |
647 ;;; This goes here so that cl-macs can find it if it loads right now. | |
5219
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
648 (provide 'cl-19) |
428 | 649 |
650 ;;; Things to do after byte-compiler is loaded. | |
651 ;;; As a side effect, we cause cl-macs to be loaded when compiling, so | |
652 ;;; that the compiler-macros defined there will be present. | |
653 | |
654 (defvar cl-hacked-flag nil) | |
655 (defun cl-hack-byte-compiler () | |
656 (if (and (not cl-hacked-flag) (fboundp 'byte-compile-file-form)) | |
657 (progn | |
2153 | 658 (setq cl-hacked-flag t) ; Do it first, to prevent recursion. |
442 | 659 (when (not (fboundp 'cl-compile-time-init)) |
660 (load "cl-macs" nil t)) | |
2153 | 661 (cl-compile-time-init)))) ; In cl-macs.el. |
428 | 662 |
663 ;;; Try it now in case the compiler has already been loaded. | |
664 (cl-hack-byte-compiler) | |
665 | |
4683
0cc9d22c3732
Be more reliable about loading cl-macs at byte-compile time, cl.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
666 ;;; Also make a hook in case compiler is loaded after this file. |
0cc9d22c3732
Be more reliable about loading cl-macs at byte-compile time, cl.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
667 (add-hook 'bytecomp-load-hook 'cl-hack-byte-compiler) |
428 | 668 |
669 ;;; The following ensures that packages which expect the old-style cl.el | |
670 ;;; will be happy with this one. | |
671 | |
672 (provide 'cl) | |
673 | |
674 (run-hooks 'cl-load-hook) | |
675 | |
2153 | 676 ;;; arch-tag: 5f07fa74-f153-4524-9303-21f5be125851 |
428 | 677 ;;; cl.el ends here |