Mercurial > hg > xemacs-beta
annotate lisp/cl-macs.el @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 01 Feb 2010 01:02:40 -0600 |
| parents | 6772ce4d982b |
| children | 6bc1f3f6cf0d |
| rev | line source |
|---|---|
| 613 | 1 ;;; cl-macs.el --- Common Lisp extensions for XEmacs Lisp (part four) |
| 428 | 2 |
| 2153 | 3 ;; Copyright (C) 1993, 2003, 2004 Free Software Foundation, Inc. |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
4 ;; Copyright (C) 2002, 2010 Ben Wing. |
| 428 | 5 |
| 6 ;; Author: Dave Gillespie <daveg@synaptics.com> | |
| 7 ;; Version: 2.02 | |
| 8 ;; Keywords: extensions | |
| 9 | |
| 10 ;; This file is part of XEmacs. | |
| 11 | |
| 12 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 13 ;; under the terms of the GNU General Public License as published by | |
| 14 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 15 ;; any later version. | |
| 16 | |
| 17 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 20 ;; General Public License for more details. | |
| 21 | |
| 22 ;; You should have received a copy of the GNU General Public License | |
| 23 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 24 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 25 ;; 02111-1307, USA. | |
| 26 | |
| 2153 | 27 ;;; Synched up with: FSF 21.3. |
| 428 | 28 |
| 29 ;;; Commentary: | |
| 30 | |
| 31 ;; These are extensions to Emacs Lisp that provide a degree of | |
| 32 ;; Common Lisp compatibility, beyond what is already built-in | |
| 33 ;; in Emacs Lisp. | |
| 34 ;; | |
| 35 ;; This package was written by Dave Gillespie; it is a complete | |
| 36 ;; rewrite of Cesar Quiroz's original cl.el package of December 1986. | |
| 37 ;; | |
| 38 ;; Bug reports, comments, and suggestions are welcome! | |
| 39 | |
| 40 ;; This file contains the portions of the Common Lisp extensions | |
| 41 ;; package which should be autoloaded, but need only be present | |
| 42 ;; if the compiler or interpreter is used---this file is not | |
| 43 ;; necessary for executing compiled code. | |
| 44 | |
| 45 ;; See cl.el for Change Log. | |
| 46 | |
| 47 | |
| 48 ;;; Code: | |
| 49 | |
| 50 (or (memq 'cl-19 features) | |
| 51 (error "Tried to load `cl-macs' before `cl'!")) | |
| 52 | |
| 53 | |
| 54 (defmacro cl-pop2 (place) | |
| 55 (list 'prog1 (list 'car (list 'cdr place)) | |
| 56 (list 'setq place (list 'cdr (list 'cdr place))))) | |
| 57 (put 'cl-pop2 'edebug-form-spec 'edebug-sexps) | |
| 58 | |
| 59 (defvar cl-optimize-safety) | |
| 60 (defvar cl-optimize-speed) | |
| 61 | |
| 62 | |
| 63 ;;; This kludge allows macros which use cl-transform-function-property | |
| 64 ;;; to be called at compile-time. | |
| 65 | |
| 66 (require | |
| 67 (progn | |
| 68 (or (fboundp 'cl-transform-function-property) | |
| 69 (defalias 'cl-transform-function-property | |
| 70 #'(lambda (n p f) | |
| 71 (list 'put (list 'quote n) (list 'quote p) | |
| 72 (list 'function (cons 'lambda f)))))) | |
| 442 | 73 'xemacs)) |
| 428 | 74 |
| 75 | |
| 76 ;;; Initialization. | |
| 77 | |
| 78 (defvar cl-old-bc-file-form nil) | |
| 79 | |
| 80 ;;;###autoload | |
| 81 (defun cl-compile-time-init () | |
| 82 (run-hooks 'cl-hack-bytecomp-hook)) | |
| 83 | |
| 84 | |
| 2153 | 85 ;;; Some predicates for analyzing Lisp forms. These are used by various |
| 86 ;;; macro expanders to optimize the results in certain common cases. | |
| 87 | |
| 88 (defconst cl-simple-funcs '(car cdr nth aref elt if and or + - 1+ 1- min max | |
| 89 car-safe cdr-safe progn prog1 prog2)) | |
| 90 (defconst cl-safe-funcs '(* / % length memq list vector vectorp | |
| 91 < > <= >= = error)) | |
| 92 | |
| 93 ;;; Check if no side effects, and executes quickly. | |
| 94 (defun cl-simple-expr-p (x &optional size) | |
| 95 (or size (setq size 10)) | |
| 96 (if (and (consp x) (not (memq (car x) '(quote function function*)))) | |
| 97 (and (symbolp (car x)) | |
| 98 (or (memq (car x) cl-simple-funcs) | |
| 99 (get (car x) 'side-effect-free)) | |
| 100 (progn | |
| 101 (setq size (1- size)) | |
| 102 (while (and (setq x (cdr x)) | |
| 103 (setq size (cl-simple-expr-p (car x) size)))) | |
| 104 (and (null x) (>= size 0) size))) | |
| 105 (and (> size 0) (1- size)))) | |
| 106 | |
| 107 (defun cl-simple-exprs-p (xs) | |
| 108 (while (and xs (cl-simple-expr-p (car xs))) | |
| 109 (setq xs (cdr xs))) | |
| 110 (not xs)) | |
| 111 | |
| 112 ;;; Check if no side effects. | |
| 113 (defun cl-safe-expr-p (x) | |
| 114 (or (not (and (consp x) (not (memq (car x) '(quote function function*))))) | |
| 115 (and (symbolp (car x)) | |
| 116 (or (memq (car x) cl-simple-funcs) | |
| 117 (memq (car x) cl-safe-funcs) | |
| 118 (get (car x) 'side-effect-free)) | |
| 119 (progn | |
| 120 (while (and (setq x (cdr x)) (cl-safe-expr-p (car x)))) | |
| 121 (null x))))) | |
| 122 | |
| 123 ;;; Check if constant (i.e., no side effects or dependencies). | |
| 124 (defun cl-const-expr-p (x) | |
| 125 (cond ((consp x) | |
| 126 (or (eq (car x) 'quote) | |
| 127 (and (memq (car x) '(function function*)) | |
| 128 (or (symbolp (nth 1 x)) | |
| 129 (and (eq (car-safe (nth 1 x)) 'lambda) 'func))))) | |
| 130 ((symbolp x) (and (memq x '(nil t)) t)) | |
| 131 (t t))) | |
| 132 | |
| 133 (defun cl-const-exprs-p (xs) | |
| 134 (while (and xs (cl-const-expr-p (car xs))) | |
| 135 (setq xs (cdr xs))) | |
| 136 (not xs)) | |
| 137 | |
| 138 (defun cl-const-expr-val (x) | |
| 139 (and (eq (cl-const-expr-p x) t) (if (consp x) (nth 1 x) x))) | |
| 140 | |
| 141 (defun cl-expr-access-order (x v) | |
| 142 (if (cl-const-expr-p x) v | |
| 143 (if (consp x) | |
| 144 (progn | |
| 145 (while (setq x (cdr x)) (setq v (cl-expr-access-order (car x) v))) | |
| 146 v) | |
| 147 (if (eq x (car v)) (cdr v) '(t))))) | |
| 148 | |
| 149 ;;; Count number of times X refers to Y. Return nil for 0 times. | |
| 150 (defun cl-expr-contains (x y) | |
| 151 (cond ((equal y x) 1) | |
| 152 ((and (consp x) (not (memq (car-safe x) '(quote function function*)))) | |
| 153 (let ((sum 0)) | |
| 154 (while x | |
| 155 (setq sum (+ sum (or (cl-expr-contains (pop x) y) 0)))) | |
| 156 (and (> sum 0) sum))) | |
| 157 (t nil))) | |
| 158 | |
| 159 (defun cl-expr-contains-any (x y) | |
| 160 (while (and y (not (cl-expr-contains x (car y)))) (pop y)) | |
| 161 y) | |
| 162 | |
| 163 ;;; Check whether X may depend on any of the symbols in Y. | |
| 164 (defun cl-expr-depends-p (x y) | |
| 165 (and (not (cl-const-expr-p x)) | |
| 166 (or (not (cl-safe-expr-p x)) (cl-expr-contains-any x y)))) | |
| 167 | |
| 168 ;;; Symbols. | |
| 169 | |
| 170 (defvar *gensym-counter*) | |
| 171 | |
| 172 ;; XEmacs change: gensym and gentemp have been moved to cl.el. | |
| 173 | |
| 174 | |
| 428 | 175 ;;; Program structure. |
| 176 | |
| 177 ;;;###autoload | |
| 178 (defmacro defun* (name args &rest body) | |
| 179 "(defun* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a function. | |
| 180 Like normal `defun', except ARGLIST allows full Common Lisp conventions, | |
| 872 | 181 and BODY is implicitly surrounded by (block NAME ...). |
| 182 | |
| 183 \"Full Common Lisp conventions\" means that: | |
| 184 | |
| 185 -- In addition to &optional and &rest, the lambda-list keywords &key, | |
| 186 &allow-other-keys, and &aux are allowed. | |
| 187 | |
| 188 -- The format of the arguments to &optional is expanded: As well as simple | |
| 189 variables, they can be lists of the form (VAR [INITFORM [SVAR]]); when | |
| 190 no argument is available for VAR, INITFORM is evaluated (or nil, if | |
| 191 INITFORM is omitted) and stored as VAR's value, and SVAR is bound to t. | |
| 192 If an arguent is available for VAR, and INITFORM is unused, SVAR is | |
| 193 bound to nil. | |
| 194 | |
| 195 -- &key specifies keyword arguments. The format of each argument is | |
| 196 VAR || ( { VAR || (KEYWORD VAR) } [INITFORM [SVAR]]) -- #### document me. | |
| 197 | |
| 198 -- &allow-other-keys means that if other keyword arguments are given that are | |
| 199 not specifically list in the arg list, they are allowed, rather than an | |
| 200 error being signalled. They can be retrieved with an &rest form. | |
| 201 | |
| 202 -- &aux specifies extra bindings, exactly like a `let*' enclosing the body. | |
| 203 The format of each binding is VAR || (VAR [INITFORM]) -- exactly like the | |
| 204 format of `let'/`let*' bindings. | |
| 205 " | |
| 428 | 206 (let* ((res (cl-transform-lambda (cons args body) name)) |
| 207 (form (list* 'defun name (cdr res)))) | |
| 208 (if (car res) (list 'progn (car res) form) form))) | |
| 209 | |
| 210 ;;;###autoload | |
| 211 (defmacro defmacro* (name args &rest body) | |
| 212 "(defmacro* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a macro. | |
| 213 Like normal `defmacro', except ARGLIST allows full Common Lisp conventions, | |
| 872 | 214 and BODY is implicitly surrounded by (block NAME ...). |
| 215 | |
| 216 \"Full Common Lisp conventions\" means that: | |
| 217 | |
| 218 -- The lambda-list keywords &optional, &rest, &key, &allow-other-keys, and | |
| 219 &aux are allowed, as in `defun*'. | |
| 220 | |
| 221 -- Three additional lambda-list keywords are allowed: &body, &whole, and | |
| 222 &environment. #### Document me. | |
| 223 | |
| 224 -- The macro arg list syntax allows for \"destructuring\" -- see also | |
| 225 `destructuring-bind', which destructures exactly like `defmacro*', and | |
| 226 `loop', which does a rather different way of destructuring. Anywhere | |
| 227 that a simple argument may appear, and (if following a lambda-list | |
| 228 keyword) a list may not normally appear, an embedded lambda list can be | |
| 229 substituted. (The format of the embedded lambda list is exactly the | |
| 230 same as for a top-level list except that &environment is not allowed.) | |
| 231 When matching this lambda list against a caller-specified argument, that | |
| 232 argument is treated as a list and normal lambda-list processing occurs, | |
| 233 just as if the entire operation were happening at top level. | |
| 234 Furthermore, any lambda list, embedded or top-level, can be dotted at its | |
| 235 end, and this will cause matching with an appropriate dotted list given | |
| 236 as an argument. | |
| 237 | |
| 238 See `loop' for practical examples of destructuring, but | |
| 239 keep in mind that `loop' destructuring is somewhat different from macro | |
| 240 destructuring in that | |
| 241 | |
| 242 (a) Macro destructuring has extra features in the various lambda-list | |
| 243 keywords, allowing for special processing of a list other than just | |
| 244 simple matching. | |
| 245 (b) Macro destructuring is strict, in that an error is signalled if the | |
| 246 actual structure does not match the expected structure. On the | |
| 247 other hand, loop destructuring is lax -- extra arguments in a list | |
| 248 are ignored, not enough arguments cause the remaining parameters to | |
| 249 receive a value of nil, etc. | |
| 250 " | |
| 428 | 251 (let* ((res (cl-transform-lambda (cons args body) name)) |
| 252 (form (list* 'defmacro name (cdr res)))) | |
| 253 (if (car res) (list 'progn (car res) form) form))) | |
| 254 | |
| 255 ;;;###autoload | |
| 256 (defmacro function* (func) | |
| 257 "(function* SYMBOL-OR-LAMBDA): introduce a function. | |
| 258 Like normal `function', except that if argument is a lambda form, its | |
| 259 ARGLIST allows full Common Lisp conventions." | |
| 260 (if (eq (car-safe func) 'lambda) | |
| 261 (let* ((res (cl-transform-lambda (cdr func) 'cl-none)) | |
| 262 (form (list 'function (cons 'lambda (cdr res))))) | |
| 263 (if (car res) (list 'progn (car res) form) form)) | |
| 264 (list 'function func))) | |
| 265 | |
| 266 (defun cl-transform-function-property (func prop form) | |
| 267 (let ((res (cl-transform-lambda form func))) | |
| 268 (append '(progn) (cdr (cdr (car res))) | |
| 269 (list (list 'put (list 'quote func) (list 'quote prop) | |
| 270 (list 'function (cons 'lambda (cdr res)))))))) | |
| 271 | |
| 272 (defconst lambda-list-keywords | |
| 273 '(&optional &rest &key &allow-other-keys &aux &whole &body &environment)) | |
| 274 | |
| 275 (defvar cl-macro-environment nil) | |
| 276 (defvar bind-block) (defvar bind-defs) (defvar bind-enquote) | |
| 277 (defvar bind-inits) (defvar bind-lets) (defvar bind-forms) | |
| 278 | |
| 452 | 279 ;; npak@ispras.ru |
| 280 (defun cl-upcase-arg (arg) | |
| 1580 | 281 ;; Changes all non-keyword symbols in `ARG' to symbols |
| 452 | 282 ;; with name in upper case. |
| 1580 | 283 ;; ARG is either symbol or list of symbols or lists |
| 452 | 284 (cond ((symbolp arg) |
| 1580 | 285 ;; Do not upcase &optional, &key etc. |
|
4694
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
286 (if (memq arg lambda-list-keywords) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
287 arg |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
288 (make-symbol (upcase (symbol-name arg))))) |
| 1580 | 289 ((listp arg) |
| 290 (let ((arg (copy-list arg)) junk) | |
| 291 ;; Clean the list | |
| 292 (let ((p (last arg))) (if (cdr p) (setcdr p (list '&rest (cdr p))))) | |
| 293 (if (setq junk (cadr (memq '&cl-defs arg))) | |
| 294 (setq arg (delq '&cl-defs (delq junk arg)))) | |
| 295 (if (memq '&cl-quote arg) | |
| 296 (setq arg (delq '&cl-quote arg))) | |
| 297 (mapcar 'cl-upcase-arg arg))) | |
| 298 (t arg))) ; Maybe we are in initializer | |
| 452 | 299 |
| 300 ;; npak@ispras.ru | |
|
4702
eb1a409c317b
Unbreak autoload.el
Mike Sperber <sperber@deinprogramm.de>
parents:
4695
diff
changeset
|
301 ;;;###autoload |
| 1580 | 302 (defun cl-function-arglist (name arglist) |
| 452 | 303 "Returns string with printed representation of arguments list. |
| 304 Supports Common Lisp lambda lists." | |
| 1580 | 305 (if (not (or (listp arglist) (symbolp arglist))) |
| 306 "Not available" | |
|
4694
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
307 (check-argument-type #'true-list-p arglist) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
308 (let ((print-gensym nil)) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
309 (condition-case nil |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
310 (prin1-to-string |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
311 (cons (if (eq name 'cl-none) 'lambda name) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
312 (cond ((null arglist) nil) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
313 ((listp arglist) (cl-upcase-arg arglist)) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
314 ((symbolp arglist) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
315 (cl-upcase-arg (list '&rest arglist))) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
316 (t (wrong-type-argument 'listp arglist))))) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
317 (t "Not available"))))) |
| 452 | 318 |
| 428 | 319 (defun cl-transform-lambda (form bind-block) |
| 320 (let* ((args (car form)) (body (cdr form)) | |
| 321 (bind-defs nil) (bind-enquote nil) | |
| 322 (bind-inits nil) (bind-lets nil) (bind-forms nil) | |
| 452 | 323 (header nil) (simple-args nil) |
|
4694
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
324 (complex-arglist (cl-function-arglist bind-block args)) |
| 452 | 325 (doc "")) |
| 428 | 326 (while (or (stringp (car body)) (eq (car-safe (car body)) 'interactive)) |
| 2153 | 327 (push (pop body) header)) |
| 428 | 328 (setq args (if (listp args) (copy-list args) (list '&rest args))) |
| 329 (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p))))) | |
| 330 (if (setq bind-defs (cadr (memq '&cl-defs args))) | |
| 331 (setq args (delq '&cl-defs (delq bind-defs args)) | |
| 332 bind-defs (cadr bind-defs))) | |
| 333 (if (setq bind-enquote (memq '&cl-quote args)) | |
| 334 (setq args (delq '&cl-quote args))) | |
| 335 (if (memq '&whole args) (error "&whole not currently implemented")) | |
| 336 (let* ((p (memq '&environment args)) (v (cadr p))) | |
| 337 (if p (setq args (nconc (delq (car p) (delq v args)) | |
| 338 (list '&aux (list v 'cl-macro-environment)))))) | |
| 339 (while (and args (symbolp (car args)) | |
| 340 (not (memq (car args) '(nil &rest &body &key &aux))) | |
| 341 (not (and (eq (car args) '&optional) | |
| 342 (or bind-defs (consp (cadr args)))))) | |
| 2153 | 343 (push (pop args) simple-args)) |
| 428 | 344 (or (eq bind-block 'cl-none) |
| 345 (setq body (list (list* 'block bind-block body)))) | |
|
4694
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
346 (setq simple-args (nreverse simple-args) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
347 header (nreverse header)) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
348 ;; Add CL lambda list to documentation, if the CL lambda list differs |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
349 ;; from the non-CL lambda list. npak@ispras.ru |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
350 (unless (equal complex-arglist |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
351 (cl-function-arglist bind-block simple-args)) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
352 (and (stringp (car header)) (setq doc (pop header))) |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
353 (push (concat doc |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
354 "\n\nCommon Lisp lambda list:\n" |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
355 " " complex-arglist "\n\n") |
|
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
356 header)) |
| 428 | 357 (if (null args) |
|
4694
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
358 (list* nil simple-args (nconc header body)) |
| 2153 | 359 (if (memq '&optional simple-args) (push '&optional args)) |
| 428 | 360 (cl-do-arglist args nil (- (length simple-args) |
| 361 (if (memq '&optional simple-args) 1 0))) | |
| 362 (setq bind-lets (nreverse bind-lets)) | |
| 363 (list* (and bind-inits (list* 'eval-when '(compile load eval) | |
| 364 (nreverse bind-inits))) | |
|
4694
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
365 (nconc simple-args |
| 2153 | 366 (list '&rest (car (pop bind-lets)))) |
| 367 ;; XEmacs change: we add usage information using Nickolay's | |
| 368 ;; approach above | |
|
4694
2ac296807b88
Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
369 (nconc header |
| 428 | 370 (list (nconc (list 'let* bind-lets) |
| 371 (nreverse bind-forms) body))))))) | |
| 372 | |
| 373 (defun cl-do-arglist (args expr &optional num) ; uses bind-* | |
| 374 (if (nlistp args) | |
| 375 (if (or (memq args lambda-list-keywords) (not (symbolp args))) | |
| 376 (error "Invalid argument name: %s" args) | |
| 2153 | 377 (push (list args expr) bind-lets)) |
| 428 | 378 (setq args (copy-list args)) |
| 379 (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p))))) | |
| 380 (let ((p (memq '&body args))) (if p (setcar p '&rest))) | |
| 381 (if (memq '&environment args) (error "&environment used incorrectly")) | |
| 382 (let ((save-args args) | |
| 383 (restarg (memq '&rest args)) | |
| 384 (safety (if (cl-compiling-file) cl-optimize-safety 3)) | |
| 385 (keys nil) | |
| 386 (laterarg nil) (exactarg nil) minarg) | |
| 387 (or num (setq num 0)) | |
| 388 (if (listp (cadr restarg)) | |
| 389 (setq restarg (gensym "--rest--")) | |
| 390 (setq restarg (cadr restarg))) | |
| 2153 | 391 (push (list restarg expr) bind-lets) |
| 428 | 392 (if (eq (car args) '&whole) |
| 2153 | 393 (push (list (cl-pop2 args) restarg) bind-lets)) |
| 428 | 394 (let ((p args)) |
| 395 (setq minarg restarg) | |
| 396 (while (and p (not (memq (car p) lambda-list-keywords))) | |
| 397 (or (eq p args) (setq minarg (list 'cdr minarg))) | |
| 398 (setq p (cdr p))) | |
| 399 (if (memq (car p) '(nil &aux)) | |
| 400 (setq minarg (list '= (list 'length restarg) | |
| 401 (length (ldiff args p))) | |
| 402 exactarg (not (eq args p))))) | |
| 403 (while (and args (not (memq (car args) lambda-list-keywords))) | |
| 404 (let ((poparg (list (if (or (cdr args) (not exactarg)) 'pop 'car) | |
| 405 restarg))) | |
| 406 (cl-do-arglist | |
| 2153 | 407 (pop args) |
| 428 | 408 (if (or laterarg (= safety 0)) poparg |
| 409 (list 'if minarg poparg | |
| 410 (list 'signal '(quote wrong-number-of-arguments) | |
| 411 (list 'list (and (not (eq bind-block 'cl-none)) | |
| 412 (list 'quote bind-block)) | |
| 413 (list 'length restarg))))))) | |
| 414 (setq num (1+ num) laterarg t)) | |
| 2153 | 415 (while (and (eq (car args) '&optional) (pop args)) |
| 428 | 416 (while (and args (not (memq (car args) lambda-list-keywords))) |
| 2153 | 417 (let ((arg (pop args))) |
| 428 | 418 (or (consp arg) (setq arg (list arg))) |
| 419 (if (cddr arg) (cl-do-arglist (nth 2 arg) (list 'and restarg t))) | |
| 420 (let ((def (if (cdr arg) (nth 1 arg) | |
| 421 (or (car bind-defs) | |
| 422 (nth 1 (assq (car arg) bind-defs))))) | |
| 423 (poparg (list 'pop restarg))) | |
| 424 (and def bind-enquote (setq def (list 'quote def))) | |
| 425 (cl-do-arglist (car arg) | |
| 426 (if def (list 'if restarg poparg def) poparg)) | |
| 427 (setq num (1+ num)))))) | |
| 428 (if (eq (car args) '&rest) | |
| 429 (let ((arg (cl-pop2 args))) | |
| 430 (if (consp arg) (cl-do-arglist arg restarg))) | |
| 431 (or (eq (car args) '&key) (= safety 0) exactarg | |
| 2153 | 432 (push (list 'if restarg |
| 428 | 433 (list 'signal '(quote wrong-number-of-arguments) |
| 434 (list 'list | |
| 435 (and (not (eq bind-block 'cl-none)) | |
| 436 (list 'quote bind-block)) | |
| 437 (list '+ num (list 'length restarg))))) | |
| 438 bind-forms))) | |
| 2153 | 439 (while (and (eq (car args) '&key) (pop args)) |
| 428 | 440 (while (and args (not (memq (car args) lambda-list-keywords))) |
| 2153 | 441 (let ((arg (pop args))) |
| 428 | 442 (or (consp arg) (setq arg (list arg))) |
|
4793
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
443 (let* ((karg (if (consp (car arg)) |
|
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
444 ;; It's possible to use non-keywords here, as |
|
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
445 ;; in the KEYWORD-ARGUMENT-NAME-PACKAGE Common |
|
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
446 ;; Lisp issue: |
|
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
447 (caar arg) |
|
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
448 ;; Use read instead of intern in case we ever |
|
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
449 ;; actually get packages and keywords are no |
|
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
450 ;; longer in obarray: |
|
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
451 (read (concat ":" (symbol-name (car arg)))))) |
| 428 | 452 (varg (if (consp (car arg)) (cadar arg) (car arg))) |
| 453 (def (if (cdr arg) (cadr arg) | |
| 454 (or (car bind-defs) (cadr (assq varg bind-defs))))) | |
|
4793
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
455 (look (list 'memq (quote-maybe karg) restarg))) |
| 428 | 456 (and def bind-enquote (setq def (list 'quote def))) |
| 457 (if (cddr arg) | |
| 458 (let* ((temp (or (nth 2 arg) (gensym))) | |
| 459 (val (list 'car (list 'cdr temp)))) | |
| 460 (cl-do-arglist temp look) | |
| 461 (cl-do-arglist varg | |
| 462 (list 'if temp | |
| 463 (list 'prog1 val (list 'setq temp t)) | |
| 464 def))) | |
| 465 (cl-do-arglist | |
| 466 varg | |
| 467 (list 'car | |
| 468 (list 'cdr | |
| 469 (if (null def) | |
| 470 look | |
| 471 (list 'or look | |
| 472 (if (eq (cl-const-expr-p def) t) | |
| 473 (list | |
| 474 'quote | |
| 475 (list nil (cl-const-expr-val def))) | |
| 476 (list 'list nil def)))))))) | |
|
4793
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
477 (push karg keys))))) |
| 428 | 478 (setq keys (nreverse keys)) |
| 2153 | 479 (or (and (eq (car args) '&allow-other-keys) (pop args)) |
| 428 | 480 (null keys) (= safety 0) |
| 481 (let* ((var (gensym "--keys--")) | |
| 482 (allow '(:allow-other-keys)) | |
| 483 (check (list | |
| 484 'while var | |
| 485 (list | |
| 486 'cond | |
| 487 (list (list 'memq (list 'car var) | |
| 488 (list 'quote (append keys allow))) | |
| 489 (list 'setq var (list 'cdr (list 'cdr var)))) | |
| 490 (list (list 'car | |
| 491 (list 'cdr | |
|
4793
8b50bee3c88c
Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
492 (list 'memq (car allow) |
| 428 | 493 restarg))) |
| 494 (list 'setq var nil)) | |
| 495 (list t | |
| 496 (list | |
| 497 'error | |
| 498 (format "Keyword argument %%s not one of %s" | |
| 499 keys) | |
| 500 (list 'car var))))))) | |
| 2153 | 501 (push (list 'let (list (list var restarg)) check) bind-forms))) |
| 502 (while (and (eq (car args) '&aux) (pop args)) | |
| 428 | 503 (while (and args (not (memq (car args) lambda-list-keywords))) |
| 504 (if (consp (car args)) | |
| 505 (if (and bind-enquote (cadar args)) | |
| 506 (cl-do-arglist (caar args) | |
| 2153 | 507 (list 'quote (cadr (pop args)))) |
| 508 (cl-do-arglist (caar args) (cadr (pop args)))) | |
| 509 (cl-do-arglist (pop args) nil)))) | |
| 428 | 510 (if args (error "Malformed argument list %s" save-args))))) |
| 511 | |
| 512 (defun cl-arglist-args (args) | |
| 513 (if (nlistp args) (list args) | |
| 514 (let ((res nil) (kind nil) arg) | |
| 515 (while (consp args) | |
| 2153 | 516 (setq arg (pop args)) |
| 428 | 517 (if (memq arg lambda-list-keywords) (setq kind arg) |
| 2153 | 518 (if (eq arg '&cl-defs) (pop args) |
| 428 | 519 (and (consp arg) kind (setq arg (car arg))) |
| 520 (and (consp arg) (cdr arg) (eq kind '&key) (setq arg (cadr arg))) | |
| 521 (setq res (nconc res (cl-arglist-args arg)))))) | |
| 522 (nconc res (and args (list args)))))) | |
| 523 | |
| 524 ;;;###autoload | |
| 525 (defmacro destructuring-bind (args expr &rest body) | |
| 872 | 526 "Bind the arguments in ARGS to EXPR then eval BODY. |
| 527 This is similar to `let' but it does \"destructuring\", in that it matches | |
| 528 the structure of ARGS to the structure of EXPR and binds corresponding | |
| 529 arguments in ARGS to their values in EXPR. The format of ARGS, and the | |
| 530 way the destructuring works, is exactly like the destructuring that occurs | |
| 531 in `defmacro*'; see that for more information. | |
| 532 | |
| 533 An alternative means of destructuring is using the `loop' macro. `loop' | |
| 534 gives practical examples of destructuring. `defmacro*' describes the | |
| 535 differences between loop and macro-style destructuring. | |
| 536 | |
| 537 You can rewrite a call to (destructuring-bind ARGS EXPR &rest BODY) using | |
| 538 `loop', approximately like this: | |
| 539 | |
| 540 (loop for ARGS = EXPR | |
| 541 return (progn BODY)) | |
| 542 | |
| 543 I say \"approximately\" because the destructuring works in a somewhat | |
| 544 different fashion, although for most reasonably simple constructs the | |
| 545 results will be the same." | |
| 428 | 546 (let* ((bind-lets nil) (bind-forms nil) (bind-inits nil) |
| 547 (bind-defs nil) (bind-block 'cl-none)) | |
| 548 (cl-do-arglist (or args '(&aux)) expr) | |
| 549 (append '(progn) bind-inits | |
| 550 (list (nconc (list 'let* (nreverse bind-lets)) | |
| 551 (nreverse bind-forms) body))))) | |
| 552 | |
| 553 | |
| 554 ;;; The `eval-when' form. | |
| 555 | |
| 556 (defvar cl-not-toplevel nil) | |
| 557 | |
| 558 ;;;###autoload | |
| 559 (defmacro eval-when (when &rest body) | |
| 560 "(eval-when (WHEN...) BODY...): control when BODY is evaluated. | |
| 561 If `compile' is in WHEN, BODY is evaluated when compiled at top-level. | |
| 562 If `load' is in WHEN, BODY is evaluated when loaded after top-level compile. | |
| 563 If `eval' is in WHEN, BODY is evaluated when interpreted or at non-top-level." | |
| 564 (if (and (fboundp 'cl-compiling-file) (cl-compiling-file) | |
| 565 (not cl-not-toplevel) (not (boundp 'for-effect))) ; horrible kludge | |
| 2153 | 566 (let ((comp (or (memq 'compile when) (memq :compile-toplevel when))) |
| 428 | 567 (cl-not-toplevel t)) |
| 2153 | 568 (if (or (memq 'load when) (memq :load-toplevel when)) |
| 428 | 569 (if comp (cons 'progn (mapcar 'cl-compile-time-too body)) |
| 570 (list* 'if nil nil body)) | |
| 571 (progn (if comp (eval (cons 'progn body))) nil))) | |
| 2153 | 572 (and (or (memq 'eval when) (memq :execute when)) |
| 428 | 573 (cons 'progn body)))) |
| 574 | |
| 575 (defun cl-compile-time-too (form) | |
| 576 (or (and (symbolp (car-safe form)) (get (car-safe form) 'byte-hunk-handler)) | |
| 577 (setq form (macroexpand | |
| 578 form (cons '(eval-when) byte-compile-macro-environment)))) | |
| 579 (cond ((eq (car-safe form) 'progn) | |
| 580 (cons 'progn (mapcar 'cl-compile-time-too (cdr form)))) | |
| 581 ((eq (car-safe form) 'eval-when) | |
| 582 (let ((when (nth 1 form))) | |
| 2153 | 583 (if (or (memq 'eval when) (memq :execute when)) |
| 428 | 584 (list* 'eval-when (cons 'compile when) (cddr form)) |
| 585 form))) | |
| 586 (t (eval form) form))) | |
| 587 | |
| 588 ;;;###autoload | |
| 589 (defmacro load-time-value (form &optional read-only) | |
| 590 "Like `progn', but evaluates the body at load time. | |
| 591 The result of the body appears to the compiler as a quoted constant." | |
| 592 (if (cl-compiling-file) | |
| 593 (let* ((temp (gentemp "--cl-load-time--")) | |
| 594 (set (list 'set (list 'quote temp) form))) | |
| 595 (if (and (fboundp 'byte-compile-file-form-defmumble) | |
| 596 (boundp 'this-kind) (boundp 'that-one)) | |
| 597 (fset 'byte-compile-file-form | |
| 598 (list 'lambda '(form) | |
| 599 (list 'fset '(quote byte-compile-file-form) | |
| 600 (list 'quote | |
| 601 (symbol-function 'byte-compile-file-form))) | |
| 602 (list 'byte-compile-file-form (list 'quote set)) | |
| 603 '(byte-compile-file-form form))) | |
| 604 ;; XEmacs change | |
| 605 (print set (symbol-value ;;'outbuffer | |
| 606 'byte-compile-output-buffer | |
| 607 ))) | |
| 608 (list 'symbol-value (list 'quote temp))) | |
| 609 (list 'quote (eval form)))) | |
| 610 | |
| 611 | |
| 612 ;;; Conditional control structures. | |
| 613 | |
| 614 ;;;###autoload | |
| 615 (defmacro case (expr &rest clauses) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
616 "Evals EXPR, chooses from CLAUSES on that value. |
| 428 | 617 Each clause looks like (KEYLIST BODY...). EXPR is evaluated and compared |
| 618 against each key in each KEYLIST; the corresponding BODY is evaluated. | |
| 619 If no clause succeeds, case returns nil. A single atom may be used in | |
| 620 place of a KEYLIST of one atom. A KEYLIST of `t' or `otherwise' is | |
| 621 allowed only in the final clause, and matches if no other keys match. | |
| 622 Key values are compared by `eql'." | |
| 623 (let* ((temp (if (cl-simple-expr-p expr 3) expr (gensym))) | |
| 624 (head-list nil) | |
| 625 (last-clause (car (last clauses))) | |
| 626 (body (cons | |
| 627 'cond | |
| 628 (mapcar | |
| 629 #'(lambda (c) | |
| 630 (cons (cond ((memq (car c) '(t otherwise)) | |
| 2153 | 631 ;; XEmacs addition: check for last clause |
| 428 | 632 (or (eq c last-clause) |
| 633 (error | |
| 634 "`%s' is allowed only as the last case clause" | |
| 635 (car c))) | |
| 636 t) | |
| 637 ((eq (car c) 'ecase-error-flag) | |
| 638 (list 'error "ecase failed: %s, %s" | |
| 639 temp (list 'quote (reverse head-list)))) | |
| 640 ((listp (car c)) | |
| 641 (setq head-list (append (car c) head-list)) | |
| 642 (list 'member* temp (list 'quote (car c)))) | |
| 643 (t | |
| 644 (if (memq (car c) head-list) | |
| 645 (error "Duplicate key in case: %s" | |
| 646 (car c))) | |
| 2153 | 647 (push (car c) head-list) |
| 428 | 648 (list 'eql temp (list 'quote (car c))))) |
| 649 (or (cdr c) '(nil)))) | |
| 650 clauses)))) | |
| 651 (if (eq temp expr) body | |
| 652 (list 'let (list (list temp expr)) body)))) | |
| 653 | |
| 654 ;; #### CL standard also requires `ccase', which signals a continuable | |
| 655 ;; error (`cerror' in XEmacs). However, I don't think it buys us | |
| 656 ;; anything to introduce it, as there is probably much more CL stuff | |
| 657 ;; missing, and the feature is not essential. --hniksic | |
| 658 | |
| 659 ;;;###autoload | |
| 660 (defmacro ecase (expr &rest clauses) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
661 "Like `case', but error if no case fits. |
| 428 | 662 `otherwise'-clauses are not allowed." |
| 2153 | 663 ;; XEmacs addition: disallow t and otherwise |
| 428 | 664 (let ((disallowed (or (assq t clauses) |
| 665 (assq 'otherwise clauses)))) | |
| 666 (if disallowed | |
| 667 (error "`%s' is not allowed in ecase" (car disallowed)))) | |
| 668 (list* 'case expr (append clauses '((ecase-error-flag))))) | |
| 669 | |
| 670 ;;;###autoload | |
| 671 (defmacro typecase (expr &rest clauses) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
672 "Evals EXPR, chooses from CLAUSES on that value. |
| 428 | 673 Each clause looks like (TYPE BODY...). EXPR is evaluated and, if it |
| 674 satisfies TYPE, the corresponding BODY is evaluated. If no clause succeeds, | |
| 675 typecase returns nil. A TYPE of `t' or `otherwise' is allowed only in the | |
| 676 final clause, and matches if no other keys match." | |
| 677 (let* ((temp (if (cl-simple-expr-p expr 3) expr (gensym))) | |
| 678 (type-list nil) | |
| 679 (body (cons | |
| 680 'cond | |
| 681 (mapcar | |
| 682 #'(lambda (c) | |
| 683 (cons (cond ((eq (car c) 'otherwise) t) | |
| 684 ((eq (car c) 'ecase-error-flag) | |
| 685 (list 'error "etypecase failed: %s, %s" | |
| 686 temp (list 'quote (reverse type-list)))) | |
| 687 (t | |
| 2153 | 688 (push (car c) type-list) |
| 428 | 689 (cl-make-type-test temp (car c)))) |
| 690 (or (cdr c) '(nil)))) | |
| 691 clauses)))) | |
| 692 (if (eq temp expr) body | |
| 693 (list 'let (list (list temp expr)) body)))) | |
| 694 | |
| 695 ;;;###autoload | |
| 696 (defmacro etypecase (expr &rest clauses) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
697 "Like `typecase', but error if no case fits. |
| 428 | 698 `otherwise'-clauses are not allowed." |
| 699 (list* 'typecase expr (append clauses '((ecase-error-flag))))) | |
| 700 | |
| 701 | |
| 702 ;;; Blocks and exits. | |
| 703 | |
| 704 ;;;###autoload | |
| 705 (defmacro block (name &rest body) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
706 "Define a lexically-scoped block named NAME. |
| 428 | 707 NAME may be any symbol. Code inside the BODY forms can call `return-from' |
| 708 to jump prematurely out of the block. This differs from `catch' and `throw' | |
| 709 in two respects: First, the NAME is an unevaluated symbol rather than a | |
| 710 quoted symbol or other form; and second, NAME is lexically rather than | |
| 711 dynamically scoped: Only references to it within BODY will work. These | |
| 712 references may appear inside macro expansions, but not inside functions | |
| 713 called from BODY." | |
| 714 (if (cl-safe-expr-p (cons 'progn body)) (cons 'progn body) | |
| 715 (list 'cl-block-wrapper | |
| 716 (list* 'catch (list 'quote (intern (format "--cl-block-%s--" name))) | |
| 717 body)))) | |
| 718 | |
| 719 (defvar cl-active-block-names nil) | |
| 720 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
721 (put 'cl-block-wrapper 'byte-compile |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
722 #'(lambda (cl-form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
723 (if (/= (length cl-form) 2) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
724 (byte-compile-warn-wrong-args cl-form 1)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
725 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
726 (if (fboundp 'byte-compile-form-do-effect) ; Check for optimizing |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
727 ; compiler |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
728 (progn |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
729 (let* ((cl-entry (cons (nth 1 (nth 1 (nth 1 cl-form))) nil)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
730 (cl-active-block-names (cons cl-entry |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
731 cl-active-block-names)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
732 (cl-body (byte-compile-top-level |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
733 (cons 'progn (cddr (nth 1 cl-form)))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
734 (if (cdr cl-entry) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
735 (byte-compile-form (list 'catch (nth 1 (nth 1 cl-form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
736 cl-body)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
737 (byte-compile-form cl-body)))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
738 (byte-compile-form (nth 1 cl-form))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
739 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
740 (put 'cl-block-throw 'byte-compile |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
741 #'(lambda (cl-form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
742 (let ((cl-found (assq (nth 1 (nth 1 cl-form)) cl-active-block-names))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
743 (if cl-found (setcdr cl-found t))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
744 (byte-compile-throw (cons 'throw (cdr cl-form))))) |
| 428 | 745 |
| 746 ;;;###autoload | |
| 2153 | 747 (defmacro return (&optional result) |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
748 "Return from the block named nil. |
| 428 | 749 This is equivalent to `(return-from nil RESULT)'." |
| 2153 | 750 (list 'return-from nil result)) |
| 428 | 751 |
| 752 ;;;###autoload | |
| 2153 | 753 (defmacro return-from (name &optional result) |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
754 "Return from the block named NAME. |
| 428 | 755 This jumps out to the innermost enclosing `(block NAME ...)' form, |
| 756 returning RESULT from that form (or nil if RESULT is omitted). | |
| 757 This is compatible with Common Lisp, but note that `defun' and | |
| 758 `defmacro' do not create implicit blocks as they do in Common Lisp." | |
| 759 (let ((name2 (intern (format "--cl-block-%s--" name)))) | |
| 2153 | 760 (list 'cl-block-throw (list 'quote name2) result))) |
| 428 | 761 |
| 762 | |
| 763 ;;; The "loop" macro. | |
| 764 | |
| 765 (defvar args) (defvar loop-accum-var) (defvar loop-accum-vars) | |
| 766 (defvar loop-bindings) (defvar loop-body) (defvar loop-destr-temps) | |
| 767 (defvar loop-finally) (defvar loop-finish-flag) (defvar loop-first-flag) | |
| 768 (defvar loop-initially) (defvar loop-map-form) (defvar loop-name) | |
| 769 (defvar loop-result) (defvar loop-result-explicit) | |
| 770 (defvar loop-result-var) (defvar loop-steps) (defvar loop-symbol-macs) | |
| 771 | |
| 772 ;;;###autoload | |
| 773 (defmacro loop (&rest args) | |
| 774 "(loop CLAUSE...): The Common Lisp `loop' macro. | |
| 800 | 775 |
| 776 The loop macro consists of a series of clauses, which do things like | |
| 777 iterate variables, set conditions for exiting the loop, accumulating values | |
| 778 to be returned as the return value of the loop, and executing arbitrary | |
| 2297 | 779 blocks of code. Each clause is processed in turn, and the loop executes its |
| 800 | 780 body repeatedly until an exit condition is hit. |
| 781 | |
| 782 It's important to understand that loop clauses such as `for' and `while', | |
| 783 which look like loop-establishing constructs, don't actually *establish* a | |
| 784 loop\; the looping is established by the `loop' clause itself, which will | |
| 785 repeatedly process its body until told to stop. `while' merely establishes | |
| 786 a condition which, when true, causes the loop to finish, and `for' sets a | |
| 787 variable to different values on each iteration (e.g. successive elements of | |
| 788 a list) and sets an exit condition when there are no more values. This | |
| 789 means, for example, that if two `for' clauses appear, you don't get two | |
| 790 nested loops, but instead two variables that are stepped in parallel, and | |
| 791 two exit conditions, either of which, if triggered, will cause the loop to | |
| 792 end. Similarly for a loop with a `for' and a `while' clause. For example: | |
| 793 | |
| 794 \(loop | |
| 795 for x in list | |
| 796 while x | |
| 797 do ...) | |
| 798 | |
| 799 In each successive iteration, X is set to the next element of the list. If | |
| 800 there are no more elements, or if any element is nil (the `while' clause), | |
| 801 the loop exits. Otherwise, the block of code following `do' is executed.) | |
| 802 | |
| 803 This example also shows that some clauses establish variable bindings -- | |
| 804 essentially like a `let' binding -- and that following clauses can | |
| 805 reference these variables. Furthermore, the entire loop is surrounded by a | |
| 806 block named nil (unless the `named' clause is given), so you can return | |
| 807 from the loop using the macro `return'. (The other way to exit the loop is | |
| 808 through the macro `loop-finish'. The difference is that some loop clauses | |
| 809 establish or accumulate a value to be returned, and `loop-finish' returns | |
| 810 this. `return', however, can only return an explicitly-specified value. | |
| 811 NOTE CAREFULLY: There is a loop clause called `return' as well as a | |
| 812 standard Lisp macro called `return'. Normally they work similarly\; but if | |
| 813 you give the loop a name with `named', you will need to use the macro | |
| 814 `return-from'.) | |
| 815 | |
| 816 Another extremely useful feature of loops is called \"destructuring\". If, | |
| 817 in place of VAR, a list (possibly dotted, possibly a tree of arbitary | |
| 818 complexity) is given, the value to be assigned is assumed to have a similar | |
| 819 structure to the list given, and variables in the list will be matched up | |
| 820 with corresponding elements in the structure. For example: | |
| 821 | |
| 822 \(loop | |
| 823 for (x y) in '((foo 1) (bar 2) (baz 3)) | |
| 824 do (puthash x y some-hash-table)) | |
| 825 | |
| 826 will add three elements to a hash table, mapping foo -> 1, bar -> 2, and | |
| 827 baz -> 3. As other examples, you can conveniently process alists using | |
| 828 | |
| 829 \(loop for (x . y) in alist do ...) | |
| 830 | |
| 831 and plists using | |
| 832 | |
| 833 \(loop for (x y) on plist by #'cddr do ...) | |
| 834 | |
| 835 Destructuring is forgiving in that mismatches in the number of elements on | |
| 836 either size will be handled gracefully, either by ignoring or initializing | |
| 1123 | 837 to nil. Destructuring is extremely powerful, and is probably the single |
| 838 most useful feature of `loop'. | |
| 839 | |
| 840 Other useful features of loops are iterating over hash-tables, collecting values into lists, and being able to modify lists in-place as you iterate over them. As an example of the first two, | |
| 841 | |
| 842 \(loop for x being the hash-key in table using (hash-value y) | |
| 843 collect (cons x y)) | |
| 844 | |
| 845 converts hash-table TABLE to an alist. (What `collect' actually does is | |
| 846 push its value onto the end of an internal list and establish this list as | |
| 847 the default return value of the loop. See below for more information.) | |
| 848 | |
| 849 An example of in-place modification is | |
| 850 | |
| 851 \(setq foo '(1 3 5)) | |
| 852 \(loop for x in-ref foo do | |
| 853 (setf x (* x x))) | |
| 854 | |
| 855 after which foo will contain '(1 9 25). | |
| 800 | 856 |
| 857 If you don't understand how a particular loop clause works, create an | |
| 858 example and use `macroexpand-sexp' to expand the macro. | |
| 859 | |
| 428 | 860 Valid clauses are: |
| 800 | 861 |
| 862 \(NOTE: Keywords in lowercase\; slashes separate different possibilities | |
| 863 for keywords, some of which are synonymous\; brackets indicate optional | |
| 864 parts of the clause. In all of the clauses with `being', the word `being', | |
| 865 the words `each' or `the', and the difference between singular and plural | |
| 866 keywords are all just syntactic sugar. Stylistically, you should write | |
| 867 either `being each foo' or `being the foos'.) | |
| 868 | |
| 869 for VAR from/upfrom/downfrom NUM1 to/upto/downto/above/below NUM2 [by NUMSTEP] | |
| 870 Step VAR across numbers. `upfrom', `upto', and `below' explicitly | |
| 871 indicate upward stepping\; `downfrom', `downto', and `above' explicitly | |
| 872 indicate downward stepping. (If none of these is given, the default is | |
| 873 upward.) `to', `upto', and `downto' cause stepping to include NUM2 as | |
| 874 the last iteration, while `above' and `below' stop just before reaching | |
| 875 NUM2. `by' can be given to indicate a stepping increment other than 1. | |
| 876 | |
| 877 for VAR in LIST [by FUNC] | |
| 878 Step VAR over elements of a LIST. FUNC specifies how to get successive | |
| 879 sublists and defaults to `cdr'. | |
| 880 | |
| 881 for VAR on LIST [by FUNC] | |
| 882 Step VAR over tails of a LIST. FUNC specifies how to get successive | |
| 883 sublists and defaults to `cdr'. | |
| 884 | |
| 885 for VAR in-ref LIST [by FUNC] | |
| 886 Step VAR over elements of a LIST, like `for ... in', except the VAR is | |
| 887 bound using `symbol-macrolet' instead of `let'. In essence, VAR is set | |
| 888 to a \"reference\" to the list element instead of the element itself\; | |
| 889 this us, you can destructively modify the list using `setf' on VAR, and | |
| 890 any changes to the list will \"magically\" reflect themselves in | |
| 891 subsequent uses of VAR. | |
| 892 | |
| 893 for VAR = INIT [then EXPR] | |
| 894 Set VAR on each iteration of the loop. If only INIT is given, use it | |
| 895 on each iteration. Otherwise, use INIT on the first iteration and EXPR | |
| 896 on subsequent ones. | |
| 897 | |
| 898 for VAR across/across-ref ARRAY | |
| 899 Step VAR across a sequence other than a list (string, vector, bit | |
| 900 vector). If `across-ref' is given, VAR is bound using | |
| 901 `symbol-macrolet' instead of `let' -- see above. | |
| 902 | |
| 903 for VAR being each/the element/elements in/of/in-ref/of-ref SEQUENCE [using (index INDEX-VAR)] | |
| 904 Step VAR across any sequence. A variable can be specified with a | |
| 905 `using' phrase to receive the index, starting at 0. If `in-ref' or | |
| 906 `of-ref' is given, VAR is bound using `symbol-macrolet' instead of | |
| 907 `let' -- see above. | |
| 908 | |
| 909 for VAR being each/the hash-key/hash-keys/hash-value/hash-values in/of HASH-TABLE [using (hash-value/hash-key OTHER-VAR)] | |
| 910 | |
| 911 for VAR being each/the hash-key/hash-keys/hash-value/hash-values in/of HASH-TABLE [using (hash-value/hash-key OTHER-VAR)] | |
| 912 Map VAR over a hash table. The various keywords are synonymous except | |
| 913 those that distinguish between keys and values. The `using' phrase is | |
| 914 optional and allows both key and value to be bound. | |
| 915 | |
| 916 for VAR being each/the symbol/present-symbol/external-symbol/symbols/present-symbols/external-symbols in/of OBARRAY | |
| 917 Map VAR over the symbols in an obarray. All symbol keywords are | |
| 918 currently synonymous. | |
| 919 | |
| 920 for VAR being each/the extent/extents [in/of BUFFER-OR-STRING] [from POS] [to POS] | |
| 921 Map VAR over the extents in a buffer or string, defaulting to the | |
| 922 current buffer, the beginning and the end, respectively. | |
| 923 | |
| 924 for VAR being each/the interval/intervals [in/of BUFFER-OR-STRING] [property PROPERTY] [from POS] [to POS] | |
| 925 Map VAR over the intervals without property change in a buffer or | |
| 926 string, defaulting to the current buffer, the beginning and the end, | |
| 927 respectively. If PROPERTY is given, iteration occurs using | |
| 928 `next-single-property-change'\; otherwise, using | |
| 929 `next-property-change'. | |
| 930 | |
| 931 for VAR being each/the window/windows [in/of FRAME] | |
| 932 Step VAR over the windows in FRAME, defaulting to the selected frame. | |
| 933 | |
| 934 for VAR being each/the frame/frames | |
| 935 Step VAR over all frames. | |
| 936 | |
| 937 for VAR being each/the buffer/buffers [by FUNC] | |
| 938 Step VAR over all buffers. This is actually equivalent to | |
| 939 `for VAR in (buffer-list) [by FUNC]'. | |
| 940 | |
| 941 for VAR being each/the key-code/key-codes/key-seq/key-seqs/key-binding/key-bindings in KEYMAP [using (key-code/key-codes/key-seq/key-seqs/key-binding/key-bindings OTHER-VAR)] | |
| 942 Map VAR over the entries in a keymap. Keyword `key-seq' causes | |
| 943 recursive mapping over prefix keymaps occurring in the keymap, with VAR | |
| 944 getting the built-up sequence (a vector). Otherwise, mapping does not | |
| 945 occur recursively. `key-code' and `key-seq' refer to what is bound | |
| 946 (second argument of `define-key'), and `key-binding' what it's bound to | |
| 947 (third argument of `define-key'). | |
| 948 | |
| 949 as VAR ... | |
| 950 `as' is a synonym for `for'. | |
| 951 | |
| 952 and VAR ... | |
| 953 `and' clauses have the same syntax as `for' clauses except that the | |
| 954 variables in the clause are bound in parallel with a preceding | |
| 955 `and'/`for' clause instead of in series. | |
| 956 | |
| 957 with VAR = INIT | |
| 958 Set VAR to INIT once, before doing any iterations. | |
| 959 | |
| 960 repeat NUM | |
| 961 Exit the loop if more than NUM iterations have occurred. | |
| 962 | |
| 963 while COND | |
| 964 Exit the loop if COND isn't true. | |
| 965 | |
| 966 until COND | |
| 967 Exit the loop if COND is true. | |
| 968 | |
| 969 collect EXPR [into VAR] | |
| 970 Push EXPR onto the end of a list of values -- stored either in VAR or a | |
| 971 temporary variable that will be returned as the return value of the | |
| 972 loop if it terminates through an exit condition or a call to | |
| 973 `loop-finish'. | |
| 974 | |
| 975 append EXPR [into VAR] | |
| 976 Append EXPR (a list) onto the end of a list of values, like `collect'. | |
| 977 | |
| 978 nconc EXPR [into VAR] | |
| 979 Nconc EXPR (a list) onto the end of a list of values, like `collect'. | |
| 980 | |
| 981 concat EXPR [into VAR] | |
| 982 Concatenate EXPR (a string) onto the end of a string of values, like | |
| 983 `collect'. | |
| 984 | |
| 985 vconcat EXPR [into VAR] | |
| 986 Concatenate EXPR (a vector) onto the end of a vector of values, like | |
| 987 `collect'. | |
| 988 | |
| 989 bvconcat EXPR [into VAR] | |
| 990 Concatenate EXPR (a bit vector) onto the end of a bit vector of values, | |
| 991 like `collect'. | |
| 992 | |
| 993 sum EXPR [into VAR] | |
| 994 Add EXPR to a value, like `collect'. | |
| 995 | |
| 996 count EXPR [into VAR] | |
| 997 If EXPR is true, increment a value by 1, like `collect'. | |
| 998 | |
| 999 maximize EXPR [into VAR] | |
| 1000 IF EXPR is greater than a value, replace the value with EXPR, like | |
| 1001 `collect'. | |
| 1002 | |
| 1003 minimize EXPR [into VAR] | |
| 1004 IF EXPR is less than a value, replace the value with EXPR, like | |
| 1005 `collect'. | |
| 1006 | |
| 1007 always COND | |
| 1008 If COND is true, continue the loop and set the loop return value (the | |
| 1009 same value that's manipulated by `collect' and friends and is returned | |
| 1010 by a normal loop exit or an exit using `loop-finish') to t\; otherwise, | |
| 1011 exit the loop and return nil. The effect is to determine and return | |
| 1012 whether a condition is true \"always\" (all iterations of the loop). | |
| 1013 | |
| 1014 never COND | |
| 1015 If COND is false, continue the loop and set the loop return value (like | |
| 1016 `always') to t\; otherwise, exit the loop and return nil. The effect | |
| 1017 is to determine and return whether a condition is \"never\" true (all | |
| 1018 iterations of the loop). | |
| 1019 | |
| 1020 thereis COND | |
| 1021 If COND is true, exit the loop and return COND. | |
| 1022 | |
| 1023 if/when COND CLAUSE [and CLAUSE]... else CLAUSE [and CLAUSE...] | |
| 1024 If COND is true, execute the directly following clause(s)\; otherwise, | |
| 1025 execute the clauses following `else'. | |
| 1026 | |
| 1027 unless COND CLAUSE [and CLAUSE]... else CLAUSE [and CLAUSE...] | |
| 1028 If COND is false, execute the directly following clause(s)\; otherwise, execute the clauses following `else'. | |
| 1029 | |
| 1030 do EXPRS... | |
| 1031 Execute the expressions (any Lisp forms). | |
| 1032 | |
| 1033 initially EXPRS... | |
| 1034 Execute EXPR once, before doing any iterations, and after values have | |
| 1035 been set using `with'. | |
| 1036 | |
| 1037 finally EXPRS... | |
| 1038 Execute EXPR once, directly before the loop terminates. This will not | |
| 1039 be executed if the loop terminates prematurely as a result of `always', | |
| 1040 `never', `thereis', or `return'. | |
| 1041 | |
| 1042 return EXPR | |
| 1043 Exit from the loop and return EXPR. | |
| 1044 | |
| 1045 finally return EXPR | |
| 1046 Specify the value to be returned when the loop exits. (Unlike `return', | |
| 1047 this doesn't cause the loop to immediately exit\; it will exit whenever | |
| 1048 it normally would have.) This takes precedence over a return value | |
| 1049 specified with `collect' and friends or `always' and friends. | |
| 1050 | |
| 1051 named NAME | |
| 1052 Specify the name for block surrounding the loop, in place of nil. | |
| 1053 (See `block'.) | |
| 1054 " | |
| 428 | 1055 (if (not (memq t (mapcar 'symbolp (delq nil (delq t (copy-list args)))))) |
| 1056 (list 'block nil (list* 'while t args)) | |
| 1057 (let ((loop-name nil) (loop-bindings nil) | |
| 1058 (loop-body nil) (loop-steps nil) | |
| 1059 (loop-result nil) (loop-result-explicit nil) | |
| 1060 (loop-result-var nil) (loop-finish-flag nil) | |
| 1061 (loop-accum-var nil) (loop-accum-vars nil) | |
| 1062 (loop-initially nil) (loop-finally nil) | |
| 1063 (loop-map-form nil) (loop-first-flag nil) | |
| 1064 (loop-destr-temps nil) (loop-symbol-macs nil)) | |
| 1065 (setq args (append args '(cl-end-loop))) | |
| 1066 (while (not (eq (car args) 'cl-end-loop)) (cl-parse-loop-clause)) | |
| 1067 (if loop-finish-flag | |
| 2153 | 1068 (push (list (list loop-finish-flag t)) loop-bindings)) |
| 428 | 1069 (if loop-first-flag |
| 2153 | 1070 (progn (push (list (list loop-first-flag t)) loop-bindings) |
| 1071 (push (list 'setq loop-first-flag nil) loop-steps))) | |
| 428 | 1072 (let* ((epilogue (nconc (nreverse loop-finally) |
| 1073 (list (or loop-result-explicit loop-result)))) | |
| 1074 (ands (cl-loop-build-ands (nreverse loop-body))) | |
| 1075 (while-body (nconc (cadr ands) (nreverse loop-steps))) | |
| 1076 (body (append | |
| 1077 (nreverse loop-initially) | |
| 1078 (list (if loop-map-form | |
| 1079 (list 'block '--cl-finish-- | |
| 1080 (subst | |
| 1081 (if (eq (car ands) t) while-body | |
| 1082 (cons (list 'or (car ands) | |
| 1083 '(return-from --cl-finish-- | |
| 1084 nil)) | |
| 1085 while-body)) | |
| 1086 '--cl-map loop-map-form)) | |
| 1087 (list* 'while (car ands) while-body))) | |
| 1088 (if loop-finish-flag | |
| 1346 | 1089 (if (equal epilogue '(nil)) |
| 1090 ;; XEmacs change: When epilogue is nil and | |
| 1091 ;; loop-finish-flag exists, you get a byte-compiler | |
| 1092 ;; warning using the original (commented-out) | |
| 1093 ;; code below. So instead we create a form that | |
| 1094 ;; gives the same result but uses loop-finish-flag. | |
| 1095 ;; --ben | |
| 1096 ;(list loop-result-var) | |
| 1097 (list (list 'if loop-finish-flag | |
| 1098 loop-result-var loop-result-var)) | |
| 428 | 1099 (list (list 'if loop-finish-flag |
| 1100 (cons 'progn epilogue) loop-result-var))) | |
| 1101 epilogue)))) | |
| 2153 | 1102 (if loop-result-var (push (list loop-result-var) loop-bindings)) |
| 428 | 1103 (while loop-bindings |
| 1104 (if (cdar loop-bindings) | |
| 2153 | 1105 (setq body (list (cl-loop-let (pop loop-bindings) body t))) |
| 428 | 1106 (let ((lets nil)) |
| 1107 (while (and loop-bindings | |
| 1108 (not (cdar loop-bindings))) | |
| 2153 | 1109 (push (car (pop loop-bindings)) lets)) |
| 428 | 1110 (setq body (list (cl-loop-let lets body nil)))))) |
| 1111 (if loop-symbol-macs | |
| 1112 (setq body (list (list* 'symbol-macrolet loop-symbol-macs body)))) | |
| 1113 (list* 'block loop-name body))))) | |
| 1114 | |
| 1115 (defun cl-parse-loop-clause () ; uses args, loop-* | |
| 2153 | 1116 (let ((word (pop args)) |
| 428 | 1117 (hash-types '(hash-key hash-keys hash-value hash-values)) |
| 1118 (key-types '(key-code key-codes key-seq key-seqs | |
| 1119 key-binding key-bindings))) | |
| 1120 (cond | |
| 1121 | |
| 1122 ((null args) | |
| 1123 (error "Malformed `loop' macro")) | |
| 1124 | |
| 1125 ((eq word 'named) | |
| 2153 | 1126 (setq loop-name (pop args))) |
| 428 | 1127 |
| 1128 ((eq word 'initially) | |
| 2153 | 1129 (if (memq (car args) '(do doing)) (pop args)) |
| 428 | 1130 (or (consp (car args)) (error "Syntax error on `initially' clause")) |
| 1131 (while (consp (car args)) | |
| 2153 | 1132 (push (pop args) loop-initially))) |
| 428 | 1133 |
| 1134 ((eq word 'finally) | |
| 1135 (if (eq (car args) 'return) | |
| 1136 (setq loop-result-explicit (or (cl-pop2 args) '(quote nil))) | |
| 2153 | 1137 (if (memq (car args) '(do doing)) (pop args)) |
| 428 | 1138 (or (consp (car args)) (error "Syntax error on `finally' clause")) |
| 1139 (if (and (eq (caar args) 'return) (null loop-name)) | |
| 2153 | 1140 (setq loop-result-explicit (or (nth 1 (pop args)) '(quote nil))) |
| 428 | 1141 (while (consp (car args)) |
| 2153 | 1142 (push (pop args) loop-finally))))) |
| 428 | 1143 |
| 1144 ((memq word '(for as)) | |
| 1145 (let ((loop-for-bindings nil) (loop-for-sets nil) (loop-for-steps nil) | |
| 1146 (ands nil)) | |
| 1147 (while | |
| 2153 | 1148 (let ((var (or (pop args) (gensym)))) |
| 1149 (setq word (pop args)) | |
| 1150 (if (eq word 'being) (setq word (pop args))) | |
| 1151 (if (memq word '(the each)) (setq word (pop args))) | |
| 428 | 1152 (if (memq word '(buffer buffers)) |
| 1153 (setq word 'in args (cons '(buffer-list) args))) | |
| 1154 (cond | |
| 1155 | |
| 1156 ((memq word '(from downfrom upfrom to downto upto | |
| 1157 above below by)) | |
| 2153 | 1158 (push word args) |
| 428 | 1159 (if (memq (car args) '(downto above)) |
| 1160 (error "Must specify `from' value for downward loop")) | |
| 1161 (let* ((down (or (eq (car args) 'downfrom) | |
| 1162 (memq (caddr args) '(downto above)))) | |
| 1163 (excl (or (memq (car args) '(above below)) | |
| 1164 (memq (caddr args) '(above below)))) | |
| 1165 (start (and (memq (car args) '(from upfrom downfrom)) | |
| 1166 (cl-pop2 args))) | |
| 1167 (end (and (memq (car args) | |
| 1168 '(to upto downto above below)) | |
| 1169 (cl-pop2 args))) | |
| 1170 (step (and (eq (car args) 'by) (cl-pop2 args))) | |
| 1171 (end-var (and (not (cl-const-expr-p end)) (gensym))) | |
| 1172 (step-var (and (not (cl-const-expr-p step)) | |
| 1173 (gensym)))) | |
| 1174 (and step (numberp step) (<= step 0) | |
| 1175 (error "Loop `by' value is not positive: %s" step)) | |
| 2153 | 1176 (push (list var (or start 0)) loop-for-bindings) |
| 1177 (if end-var (push (list end-var end) loop-for-bindings)) | |
| 1178 (if step-var (push (list step-var step) | |
| 428 | 1179 loop-for-bindings)) |
| 1180 (if end | |
| 2153 | 1181 (push (list |
| 428 | 1182 (if down (if excl '> '>=) (if excl '< '<=)) |
| 1183 var (or end-var end)) loop-body)) | |
| 2153 | 1184 (push (list var (list (if down '- '+) var |
| 428 | 1185 (or step-var step 1))) |
| 1186 loop-for-steps))) | |
| 1187 | |
| 1188 ((memq word '(in in-ref on)) | |
| 1189 (let* ((on (eq word 'on)) | |
| 1190 (temp (if (and on (symbolp var)) var (gensym)))) | |
| 2153 | 1191 (push (list temp (pop args)) loop-for-bindings) |
| 1192 (push (list 'consp temp) loop-body) | |
| 428 | 1193 (if (eq word 'in-ref) |
| 2153 | 1194 (push (list var (list 'car temp)) loop-symbol-macs) |
| 428 | 1195 (or (eq temp var) |
| 1196 (progn | |
| 2153 | 1197 (push (list var nil) loop-for-bindings) |
| 1198 (push (list var (if on temp (list 'car temp))) | |
| 428 | 1199 loop-for-sets)))) |
| 2153 | 1200 (push (list temp |
| 428 | 1201 (if (eq (car args) 'by) |
| 1202 (let ((step (cl-pop2 args))) | |
| 1203 (if (and (memq (car-safe step) | |
| 1204 '(quote function | |
| 1205 function*)) | |
| 1206 (symbolp (nth 1 step))) | |
| 1207 (list (nth 1 step) temp) | |
| 1208 (list 'funcall step temp))) | |
| 1209 (list 'cdr temp))) | |
| 1210 loop-for-steps))) | |
| 1211 | |
| 1212 ((eq word '=) | |
| 2153 | 1213 (let* ((start (pop args)) |
| 428 | 1214 (then (if (eq (car args) 'then) (cl-pop2 args) start))) |
| 2153 | 1215 (push (list var nil) loop-for-bindings) |
| 428 | 1216 (if (or ands (eq (car args) 'and)) |
| 1217 (progn | |
| 2153 | 1218 (push (list var |
| 428 | 1219 (list 'if |
| 1220 (or loop-first-flag | |
| 1221 (setq loop-first-flag | |
| 1222 (gensym))) | |
| 1223 start var)) | |
| 1224 loop-for-sets) | |
| 2153 | 1225 (push (list var then) loop-for-steps)) |
| 1226 (push (list var | |
| 428 | 1227 (if (eq start then) start |
| 1228 (list 'if | |
| 1229 (or loop-first-flag | |
| 1230 (setq loop-first-flag (gensym))) | |
| 1231 start then))) | |
| 1232 loop-for-sets)))) | |
| 1233 | |
| 1234 ((memq word '(across across-ref)) | |
| 1235 (let ((temp-vec (gensym)) (temp-idx (gensym))) | |
| 2153 | 1236 (push (list temp-vec (pop args)) loop-for-bindings) |
| 1237 (push (list temp-idx -1) loop-for-bindings) | |
| 1238 (push (list '< (list 'setq temp-idx (list '1+ temp-idx)) | |
| 428 | 1239 (list 'length temp-vec)) loop-body) |
| 1240 (if (eq word 'across-ref) | |
| 2153 | 1241 (push (list var (list 'aref temp-vec temp-idx)) |
| 428 | 1242 loop-symbol-macs) |
| 2153 | 1243 (push (list var nil) loop-for-bindings) |
| 1244 (push (list var (list 'aref temp-vec temp-idx)) | |
| 428 | 1245 loop-for-sets)))) |
| 1246 | |
| 1247 ((memq word '(element elements)) | |
| 1248 (let ((ref (or (memq (car args) '(in-ref of-ref)) | |
| 1249 (and (not (memq (car args) '(in of))) | |
| 1250 (error "Expected `of'")))) | |
| 1251 (seq (cl-pop2 args)) | |
| 1252 (temp-seq (gensym)) | |
| 1253 (temp-idx (if (eq (car args) 'using) | |
| 1254 (if (and (= (length (cadr args)) 2) | |
| 1255 (eq (caadr args) 'index)) | |
| 1256 (cadr (cl-pop2 args)) | |
| 1257 (error "Bad `using' clause")) | |
| 1258 (gensym)))) | |
| 2153 | 1259 (push (list temp-seq seq) loop-for-bindings) |
| 1260 (push (list temp-idx 0) loop-for-bindings) | |
| 428 | 1261 (if ref |
| 1262 (let ((temp-len (gensym))) | |
| 2153 | 1263 (push (list temp-len (list 'length temp-seq)) |
| 428 | 1264 loop-for-bindings) |
| 2153 | 1265 (push (list var (list 'elt temp-seq temp-idx)) |
| 428 | 1266 loop-symbol-macs) |
| 2153 | 1267 (push (list '< temp-idx temp-len) loop-body)) |
| 1268 (push (list var nil) loop-for-bindings) | |
| 1269 (push (list 'and temp-seq | |
| 428 | 1270 (list 'or (list 'consp temp-seq) |
| 1271 (list '< temp-idx | |
| 1272 (list 'length temp-seq)))) | |
| 1273 loop-body) | |
| 2153 | 1274 (push (list var (list 'if (list 'consp temp-seq) |
| 428 | 1275 (list 'pop temp-seq) |
| 1276 (list 'aref temp-seq temp-idx))) | |
| 1277 loop-for-sets)) | |
| 2153 | 1278 (push (list temp-idx (list '1+ temp-idx)) |
| 428 | 1279 loop-for-steps))) |
| 1280 | |
| 1281 ((memq word hash-types) | |
| 1282 (or (memq (car args) '(in of)) (error "Expected `of'")) | |
| 1283 (let* ((table (cl-pop2 args)) | |
| 1284 (other (if (eq (car args) 'using) | |
| 1285 (if (and (= (length (cadr args)) 2) | |
| 1286 (memq (caadr args) hash-types) | |
| 1287 (not (eq (caadr args) word))) | |
| 1288 (cadr (cl-pop2 args)) | |
| 1289 (error "Bad `using' clause")) | |
| 1290 (gensym)))) | |
| 1291 (if (memq word '(hash-value hash-values)) | |
| 1292 (setq var (prog1 other (setq other var)))) | |
| 1293 (setq loop-map-form | |
| 1294 (list 'maphash (list 'function | |
| 1295 (list* 'lambda (list var other) | |
| 1296 '--cl-map)) table)))) | |
| 1297 | |
| 1298 ((memq word '(symbol present-symbol external-symbol | |
| 1299 symbols present-symbols external-symbols)) | |
| 1300 (let ((ob (and (memq (car args) '(in of)) (cl-pop2 args)))) | |
| 1301 (setq loop-map-form | |
| 1302 (list 'mapatoms (list 'function | |
| 1303 (list* 'lambda (list var) | |
| 1304 '--cl-map)) ob)))) | |
| 1305 | |
| 1306 ((memq word '(overlay overlays extent extents)) | |
| 1307 (let ((buf nil) (from nil) (to nil)) | |
| 1308 (while (memq (car args) '(in of from to)) | |
| 1309 (cond ((eq (car args) 'from) (setq from (cl-pop2 args))) | |
| 1310 ((eq (car args) 'to) (setq to (cl-pop2 args))) | |
| 1311 (t (setq buf (cl-pop2 args))))) | |
| 1312 (setq loop-map-form | |
| 1313 (list 'cl-map-extents | |
| 1314 (list 'function (list 'lambda (list var (gensym)) | |
| 1315 '(progn . --cl-map) nil)) | |
| 1316 buf from to)))) | |
| 1317 | |
| 1318 ((memq word '(interval intervals)) | |
| 1319 (let ((buf nil) (prop nil) (from nil) (to nil) | |
| 1320 (var1 (gensym)) (var2 (gensym))) | |
| 1321 (while (memq (car args) '(in of property from to)) | |
| 1322 (cond ((eq (car args) 'from) (setq from (cl-pop2 args))) | |
| 1323 ((eq (car args) 'to) (setq to (cl-pop2 args))) | |
| 1324 ((eq (car args) 'property) | |
| 1325 (setq prop (cl-pop2 args))) | |
| 1326 (t (setq buf (cl-pop2 args))))) | |
| 1327 (if (and (consp var) (symbolp (car var)) (symbolp (cdr var))) | |
| 1328 (setq var1 (car var) var2 (cdr var)) | |
| 2153 | 1329 (push (list var (list 'cons var1 var2)) loop-for-sets)) |
| 428 | 1330 (setq loop-map-form |
| 1331 (list 'cl-map-intervals | |
| 1332 (list 'function (list 'lambda (list var1 var2) | |
| 1333 '(progn . --cl-map))) | |
| 1334 buf prop from to)))) | |
| 1335 | |
| 1336 ((memq word key-types) | |
| 1337 (or (memq (car args) '(in of)) (error "Expected `of'")) | |
| 800 | 1338 (let* ((map (cl-pop2 args)) |
| 1339 other-word | |
| 1340 (other (if (eq (car args) 'using) | |
| 1341 (if (and (= (length (cadr args)) 2) | |
| 1342 (memq (setq other-word (caadr args)) | |
| 1343 key-types) | |
| 1344 (not (eq (caadr args) word))) | |
| 1345 (cadr (cl-pop2 args)) | |
| 1346 (error "Bad `using' clause")) | |
| 428 | 1347 (gensym)))) |
| 2153 | 1348 ;; XEmacs addition: track other-word |
| 800 | 1349 (when (memq word '(key-binding key-bindings)) |
| 1350 (setq var (prog1 other (setq other var))) | |
| 1351 (and other-word (setq word other-word))) | |
| 428 | 1352 (setq loop-map-form |
| 1353 (list (if (memq word '(key-seq key-seqs)) | |
| 2153 | 1354 'cl-map-keymap-recursively 'map-keymap) |
| 428 | 1355 (list 'function (list* 'lambda (list var other) |
| 1356 '--cl-map)) map)))) | |
| 1357 | |
| 1358 ((memq word '(frame frames screen screens)) | |
| 1359 (let ((temp (gensym))) | |
| 2153 | 1360 (push (list var '(selected-frame)) |
| 428 | 1361 loop-for-bindings) |
| 2153 | 1362 (push (list temp nil) loop-for-bindings) |
| 1363 (push (list 'prog1 (list 'not (list 'eq var temp)) | |
| 428 | 1364 (list 'or temp (list 'setq temp var))) |
| 1365 loop-body) | |
| 2153 | 1366 (push (list var (list 'next-frame var)) |
| 428 | 1367 loop-for-steps))) |
| 1368 | |
| 1369 ((memq word '(window windows)) | |
| 1370 (let ((scr (and (memq (car args) '(in of)) (cl-pop2 args))) | |
| 1371 (temp (gensym))) | |
| 2153 | 1372 (push (list var (if scr |
| 428 | 1373 (list 'frame-selected-window scr) |
| 1374 '(selected-window))) | |
| 1375 loop-for-bindings) | |
| 2153 | 1376 (push (list temp nil) loop-for-bindings) |
| 1377 (push (list 'prog1 (list 'not (list 'eq var temp)) | |
| 428 | 1378 (list 'or temp (list 'setq temp var))) |
| 1379 loop-body) | |
| 2153 | 1380 (push (list var (list 'next-window var)) loop-for-steps))) |
| 428 | 1381 |
| 1382 (t | |
| 1383 (let ((handler (and (symbolp word) | |
| 1384 (get word 'cl-loop-for-handler)))) | |
| 1385 (if handler | |
| 1386 (funcall handler var) | |
| 1387 (error "Expected a `for' preposition, found %s" word))))) | |
| 1388 (eq (car args) 'and)) | |
| 1389 (setq ands t) | |
| 2153 | 1390 (pop args)) |
| 428 | 1391 (if (and ands loop-for-bindings) |
| 2153 | 1392 (push (nreverse loop-for-bindings) loop-bindings) |
| 428 | 1393 (setq loop-bindings (nconc (mapcar 'list loop-for-bindings) |
| 1394 loop-bindings))) | |
| 1395 (if loop-for-sets | |
| 2153 | 1396 (push (list 'progn |
| 428 | 1397 (cl-loop-let (nreverse loop-for-sets) 'setq ands) |
| 1398 t) loop-body)) | |
| 1399 (if loop-for-steps | |
| 2153 | 1400 (push (cons (if ands 'psetq 'setq) |
| 428 | 1401 (apply 'append (nreverse loop-for-steps))) |
| 1402 loop-steps)))) | |
| 1403 | |
| 1404 ((eq word 'repeat) | |
| 1405 (let ((temp (gensym))) | |
| 2153 | 1406 (push (list (list temp (pop args))) loop-bindings) |
| 1407 (push (list '>= (list 'setq temp (list '1- temp)) 0) loop-body))) | |
| 1408 | |
| 1409 ((memq word '(collect collecting)) | |
| 1410 (let ((what (pop args)) | |
| 428 | 1411 (var (cl-loop-handle-accum nil 'nreverse))) |
| 1412 (if (eq var loop-accum-var) | |
| 2153 | 1413 (push (list 'progn (list 'push what var) t) loop-body) |
| 1414 (push (list 'progn | |
| 428 | 1415 (list 'setq var (list 'nconc var (list 'list what))) |
| 1416 t) loop-body)))) | |
| 1417 | |
| 1418 ((memq word '(nconc nconcing append appending)) | |
| 2153 | 1419 (let ((what (pop args)) |
| 428 | 1420 (var (cl-loop-handle-accum nil 'nreverse))) |
| 2153 | 1421 (push (list 'progn |
| 428 | 1422 (list 'setq var |
| 1423 (if (eq var loop-accum-var) | |
| 1424 (list 'nconc | |
| 1425 (list (if (memq word '(nconc nconcing)) | |
| 1426 'nreverse 'reverse) | |
| 1427 what) | |
| 1428 var) | |
| 1429 (list (if (memq word '(nconc nconcing)) | |
| 1430 'nconc 'append) | |
| 1431 var what))) t) loop-body))) | |
| 1432 | |
| 1433 ((memq word '(concat concating)) | |
| 2153 | 1434 (let ((what (pop args)) |
| 428 | 1435 (var (cl-loop-handle-accum ""))) |
| 2153 | 1436 (push (list 'progn (list 'callf 'concat var what) t) loop-body))) |
| 428 | 1437 |
| 1438 ((memq word '(vconcat vconcating)) | |
| 2153 | 1439 (let ((what (pop args)) |
| 428 | 1440 (var (cl-loop-handle-accum []))) |
| 2153 | 1441 (push (list 'progn (list 'callf 'vconcat var what) t) loop-body))) |
| 1442 | |
| 1443 ;; XEmacs addition: handle bit-vectors | |
| 800 | 1444 ((memq word '(bvconcat bvconcating)) |
| 2153 | 1445 (let ((what (pop args)) |
| 800 | 1446 (var (cl-loop-handle-accum #*))) |
| 2153 | 1447 (push (list 'progn (list 'callf 'bvconcat var what) t) loop-body))) |
| 800 | 1448 |
| 428 | 1449 ((memq word '(sum summing)) |
| 2153 | 1450 (let ((what (pop args)) |
| 428 | 1451 (var (cl-loop-handle-accum 0))) |
| 2153 | 1452 (push (list 'progn (list 'incf var what) t) loop-body))) |
| 428 | 1453 |
| 1454 ((memq word '(count counting)) | |
| 2153 | 1455 (let ((what (pop args)) |
| 428 | 1456 (var (cl-loop-handle-accum 0))) |
| 2153 | 1457 (push (list 'progn (list 'if what (list 'incf var)) t) loop-body))) |
| 428 | 1458 |
| 1459 ((memq word '(minimize minimizing maximize maximizing)) | |
| 2153 | 1460 (let* ((what (pop args)) |
| 428 | 1461 (temp (if (cl-simple-expr-p what) what (gensym))) |
| 1462 (var (cl-loop-handle-accum nil)) | |
| 1463 (func (intern (substring (symbol-name word) 0 3))) | |
| 1464 (set (list 'setq var (list 'if var (list func var temp) temp)))) | |
| 2153 | 1465 (push (list 'progn (if (eq temp what) set |
| 428 | 1466 (list 'let (list (list temp what)) set)) |
| 1467 t) loop-body))) | |
| 1468 | |
| 1469 ((eq word 'with) | |
| 1470 (let ((bindings nil)) | |
| 2153 | 1471 (while (progn (push (list (pop args) |
| 428 | 1472 (and (eq (car args) '=) (cl-pop2 args))) |
| 1473 bindings) | |
| 1474 (eq (car args) 'and)) | |
| 2153 | 1475 (pop args)) |
| 1476 (push (nreverse bindings) loop-bindings))) | |
| 428 | 1477 |
| 1478 ((eq word 'while) | |
| 2153 | 1479 (push (pop args) loop-body)) |
| 428 | 1480 |
| 1481 ((eq word 'until) | |
| 2153 | 1482 (push (list 'not (pop args)) loop-body)) |
| 428 | 1483 |
| 1484 ((eq word 'always) | |
| 1485 (or loop-finish-flag (setq loop-finish-flag (gensym))) | |
| 2153 | 1486 (push (list 'setq loop-finish-flag (pop args)) loop-body) |
| 428 | 1487 (setq loop-result t)) |
| 1488 | |
| 1489 ((eq word 'never) | |
| 1490 (or loop-finish-flag (setq loop-finish-flag (gensym))) | |
| 2153 | 1491 (push (list 'setq loop-finish-flag (list 'not (pop args))) |
| 428 | 1492 loop-body) |
| 1493 (setq loop-result t)) | |
| 1494 | |
| 1495 ((eq word 'thereis) | |
| 1496 (or loop-finish-flag (setq loop-finish-flag (gensym))) | |
| 1497 (or loop-result-var (setq loop-result-var (gensym))) | |
| 2153 | 1498 (push (list 'setq loop-finish-flag |
| 1499 (list 'not (list 'setq loop-result-var (pop args)))) | |
| 428 | 1500 loop-body)) |
| 1501 | |
| 1502 ((memq word '(if when unless)) | |
| 2153 | 1503 (let* ((cond (pop args)) |
| 428 | 1504 (then (let ((loop-body nil)) |
| 1505 (cl-parse-loop-clause) | |
| 1506 (cl-loop-build-ands (nreverse loop-body)))) | |
| 1507 (else (let ((loop-body nil)) | |
| 1508 (if (eq (car args) 'else) | |
| 2153 | 1509 (progn (pop args) (cl-parse-loop-clause))) |
| 428 | 1510 (cl-loop-build-ands (nreverse loop-body)))) |
| 1511 (simple (and (eq (car then) t) (eq (car else) t)))) | |
| 2153 | 1512 (if (eq (car args) 'end) (pop args)) |
| 428 | 1513 (if (eq word 'unless) (setq then (prog1 else (setq else then)))) |
| 1514 (let ((form (cons (if simple (cons 'progn (nth 1 then)) (nth 2 then)) | |
| 1515 (if simple (nth 1 else) (list (nth 2 else)))))) | |
| 1516 (if (cl-expr-contains form 'it) | |
| 1517 (let ((temp (gensym))) | |
| 2153 | 1518 (push (list temp) loop-bindings) |
| 428 | 1519 (setq form (list* 'if (list 'setq temp cond) |
| 1520 (subst temp 'it form)))) | |
| 1521 (setq form (list* 'if cond form))) | |
| 2153 | 1522 (push (if simple (list 'progn form t) form) loop-body)))) |
| 428 | 1523 |
| 1524 ((memq word '(do doing)) | |
| 1525 (let ((body nil)) | |
| 1526 (or (consp (car args)) (error "Syntax error on `do' clause")) | |
| 2153 | 1527 (while (consp (car args)) (push (pop args) body)) |
| 1528 (push (cons 'progn (nreverse (cons t body))) loop-body))) | |
| 428 | 1529 |
| 1530 ((eq word 'return) | |
| 1531 (or loop-finish-flag (setq loop-finish-flag (gensym))) | |
| 1532 (or loop-result-var (setq loop-result-var (gensym))) | |
| 2153 | 1533 (push (list 'setq loop-result-var (pop args) |
| 428 | 1534 loop-finish-flag nil) loop-body)) |
| 1535 | |
| 1536 (t | |
| 1537 (let ((handler (and (symbolp word) (get word 'cl-loop-handler)))) | |
| 1538 (or handler (error "Expected a loop keyword, found %s" word)) | |
| 1539 (funcall handler)))) | |
| 1540 (if (eq (car args) 'and) | |
| 2153 | 1541 (progn (pop args) (cl-parse-loop-clause))))) |
| 428 | 1542 |
| 1543 (defun cl-loop-let (specs body par) ; uses loop-* | |
| 1544 (let ((p specs) (temps nil) (new nil)) | |
| 1545 (while (and p (or (symbolp (car-safe (car p))) (null (cadar p)))) | |
| 1546 (setq p (cdr p))) | |
| 1547 (and par p | |
| 1548 (progn | |
| 1549 (setq par nil p specs) | |
| 1550 (while p | |
| 1551 (or (cl-const-expr-p (cadar p)) | |
| 1552 (let ((temp (gensym))) | |
| 2153 | 1553 (push (list temp (cadar p)) temps) |
| 428 | 1554 (setcar (cdar p) temp))) |
| 1555 (setq p (cdr p))))) | |
| 1556 (while specs | |
| 1557 (if (and (consp (car specs)) (listp (caar specs))) | |
| 1558 (let* ((spec (caar specs)) (nspecs nil) | |
| 2153 | 1559 (expr (cadr (pop specs))) |
| 428 | 1560 (temp (cdr (or (assq spec loop-destr-temps) |
| 2153 | 1561 (car (push (cons spec (or (last spec 0) |
| 428 | 1562 (gensym))) |
| 1563 loop-destr-temps)))))) | |
| 2153 | 1564 (push (list temp expr) new) |
| 428 | 1565 (while (consp spec) |
| 2153 | 1566 (push (list (pop spec) |
| 428 | 1567 (and expr (list (if spec 'pop 'car) temp))) |
| 1568 nspecs)) | |
| 1569 (setq specs (nconc (nreverse nspecs) specs))) | |
| 2153 | 1570 (push (pop specs) new))) |
| 428 | 1571 (if (eq body 'setq) |
| 1572 (let ((set (cons (if par 'psetq 'setq) (apply 'nconc (nreverse new))))) | |
| 1573 (if temps (list 'let* (nreverse temps) set) set)) | |
| 1574 (list* (if par 'let 'let*) | |
| 1575 (nconc (nreverse temps) (nreverse new)) body)))) | |
| 1576 | |
| 1577 (defun cl-loop-handle-accum (def &optional func) ; uses args, loop-* | |
| 1578 (if (eq (car args) 'into) | |
| 1579 (let ((var (cl-pop2 args))) | |
| 1580 (or (memq var loop-accum-vars) | |
| 2153 | 1581 (progn (push (list (list var def)) loop-bindings) |
| 1582 (push var loop-accum-vars))) | |
| 428 | 1583 var) |
| 1584 (or loop-accum-var | |
| 1585 (progn | |
| 2153 | 1586 (push (list (list (setq loop-accum-var (gensym)) def)) |
| 428 | 1587 loop-bindings) |
| 1588 (setq loop-result (if func (list func loop-accum-var) | |
| 1589 loop-accum-var)) | |
| 1590 loop-accum-var)))) | |
| 1591 | |
| 1592 (defun cl-loop-build-ands (clauses) | |
| 1593 (let ((ands nil) | |
| 1594 (body nil)) | |
| 1595 (while clauses | |
| 1596 (if (and (eq (car-safe (car clauses)) 'progn) | |
| 1597 (eq (car (last (car clauses))) t)) | |
| 1598 (if (cdr clauses) | |
| 1599 (setq clauses (cons (nconc (butlast (car clauses)) | |
| 1600 (if (eq (car-safe (cadr clauses)) | |
| 1601 'progn) | |
| 1602 (cdadr clauses) | |
| 1603 (list (cadr clauses)))) | |
| 1604 (cddr clauses))) | |
| 2153 | 1605 (setq body (cdr (butlast (pop clauses))))) |
| 1606 (push (pop clauses) ands))) | |
| 428 | 1607 (setq ands (or (nreverse ands) (list t))) |
| 1608 (list (if (cdr ands) (cons 'and ands) (car ands)) | |
| 1609 body | |
| 1610 (let ((full (if body | |
| 1611 (append ands (list (cons 'progn (append body '(t))))) | |
| 1612 ands))) | |
| 1613 (if (cdr full) (cons 'and full) (car full)))))) | |
| 1614 | |
| 1615 | |
| 1616 ;;; Other iteration control structures. | |
| 1617 | |
| 1618 ;;;###autoload | |
| 1619 (defmacro do (steps endtest &rest body) | |
| 1620 "The Common Lisp `do' loop. | |
| 1621 Format is: (do ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)" | |
| 1622 (cl-expand-do-loop steps endtest body nil)) | |
| 1623 | |
| 1624 ;;;###autoload | |
| 1625 (defmacro do* (steps endtest &rest body) | |
| 1626 "The Common Lisp `do*' loop. | |
| 1627 Format is: (do* ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)" | |
| 1628 (cl-expand-do-loop steps endtest body t)) | |
| 1629 | |
| 1630 (defun cl-expand-do-loop (steps endtest body star) | |
| 1631 (list 'block nil | |
| 1632 (list* (if star 'let* 'let) | |
| 1633 (mapcar #'(lambda (c) (if (consp c) (list (car c) (nth 1 c)) c)) | |
| 1634 steps) | |
| 1635 (list* 'while (list 'not (car endtest)) | |
| 1636 (append body | |
| 1637 (let ((sets (mapcar | |
| 1638 #'(lambda (c) | |
| 1639 (and (consp c) (cdr (cdr c)) | |
| 1640 (list (car c) (nth 2 c)))) | |
| 1641 steps))) | |
| 1642 (setq sets (delq nil sets)) | |
| 1643 (and sets | |
| 1644 (list (cons (if (or star (not (cdr sets))) | |
| 1645 'setq 'psetq) | |
| 1646 (apply 'append sets))))))) | |
| 1647 (or (cdr endtest) '(nil))))) | |
| 1648 | |
| 1649 ;;;###autoload | |
| 1650 (defmacro dolist (spec &rest body) | |
| 1651 "(dolist (VAR LIST [RESULT]) BODY...): loop over a list. | |
| 1652 Evaluate BODY with VAR bound to each `car' from LIST, in turn. | |
| 1653 Then evaluate RESULT to get return value, default nil." | |
| 1654 (let ((temp (gensym "--dolist-temp--"))) | |
| 1655 (list 'block nil | |
| 1656 (list* 'let (list (list temp (nth 1 spec)) (car spec)) | |
| 1657 (list* 'while temp (list 'setq (car spec) (list 'car temp)) | |
| 1658 (append body (list (list 'setq temp | |
| 1659 (list 'cdr temp))))) | |
| 1660 (if (cdr (cdr spec)) | |
| 1661 (cons (list 'setq (car spec) nil) (cdr (cdr spec))) | |
| 1662 '(nil)))))) | |
| 1663 | |
| 1664 ;;;###autoload | |
| 1665 (defmacro dotimes (spec &rest body) | |
| 1666 "(dotimes (VAR COUNT [RESULT]) BODY...): loop a certain number of times. | |
| 1667 Evaluate BODY with VAR bound to successive integers from 0, inclusive, | |
| 1668 to COUNT, exclusive. Then evaluate RESULT to get return value, default | |
| 1669 nil." | |
| 1670 (let ((temp (gensym "--dotimes-temp--"))) | |
| 1671 (list 'block nil | |
| 1672 (list* 'let (list (list temp (nth 1 spec)) (list (car spec) 0)) | |
| 1673 (list* 'while (list '< (car spec) temp) | |
| 1674 (append body (list (list 'incf (car spec))))) | |
| 1675 (or (cdr (cdr spec)) '(nil)))))) | |
| 1676 | |
| 1677 ;;;###autoload | |
| 1678 (defmacro do-symbols (spec &rest body) | |
| 1679 "(dosymbols (VAR [OBARRAY [RESULT]]) BODY...): loop over all symbols. | |
| 1680 Evaluate BODY with VAR bound to each interned symbol, or to each symbol | |
| 1681 from OBARRAY." | |
| 1682 ;; Apparently this doesn't have an implicit block. | |
| 1683 (list 'block nil | |
| 1684 (list 'let (list (car spec)) | |
| 1685 (list* 'mapatoms | |
| 1686 (list 'function (list* 'lambda (list (car spec)) body)) | |
| 1687 (and (cadr spec) (list (cadr spec)))) | |
| 1688 (caddr spec)))) | |
| 1689 | |
| 1690 ;;;###autoload | |
| 1691 (defmacro do-all-symbols (spec &rest body) | |
| 1692 (list* 'do-symbols (list (car spec) nil (cadr spec)) body)) | |
| 1693 | |
| 1694 | |
| 1695 ;;; Assignments. | |
| 1696 | |
| 1697 ;;;###autoload | |
| 1698 (defmacro psetq (&rest args) | |
| 1699 "(psetq SYM VAL SYM VAL ...): set SYMs to the values VALs in parallel. | |
| 1700 This is like `setq', except that all VAL forms are evaluated (in order) | |
| 1701 before assigning any symbols SYM to the corresponding values." | |
| 1702 (cons 'psetf args)) | |
| 1703 | |
| 1704 | |
| 1705 ;;; Binding control structures. | |
| 1706 | |
| 1707 ;;;###autoload | |
| 1708 (defmacro progv (symbols values &rest body) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
1709 "Bind SYMBOLS to VALUES dynamically in BODY. |
| 428 | 1710 The forms SYMBOLS and VALUES are evaluated, and must evaluate to lists. |
| 1711 Each SYMBOL in the first list is bound to the corresponding VALUE in the | |
| 1712 second list (or made unbound if VALUES is shorter than SYMBOLS); then the | |
| 1713 BODY forms are executed and their result is returned. This is much like | |
| 1714 a `let' form, except that the list of symbols can be computed at run-time." | |
| 1715 (list 'let '((cl-progv-save nil)) | |
| 1716 (list 'unwind-protect | |
| 1717 (list* 'progn (list 'cl-progv-before symbols values) body) | |
| 1718 '(cl-progv-after)))) | |
| 1719 | |
| 1720 ;;; This should really have some way to shadow 'byte-compile properties, etc. | |
| 1721 ;;;###autoload | |
| 1722 (defmacro flet (bindings &rest body) | |
| 1723 "(flet ((FUNC ARGLIST BODY...) ...) FORM...): make temporary function defns. | |
| 1724 This is an analogue of `let' that operates on the function cell of FUNC | |
| 1725 rather than its value cell. The FORMs are evaluated with the specified | |
| 1726 function definitions in place, then the definitions are undone (the FUNCs | |
| 1727 go back to their previous definitions, or lack thereof)." | |
| 1728 (list* 'letf* | |
| 1729 (mapcar | |
| 1730 #'(lambda (x) | |
| 1731 (if (or (and (fboundp (car x)) | |
| 1732 (eq (car-safe (symbol-function (car x))) 'macro)) | |
| 1733 (cdr (assq (car x) cl-macro-environment))) | |
| 1734 (error "Use `labels', not `flet', to rebind macro names")) | |
| 1735 (let ((func (list 'function* | |
| 1736 (list 'lambda (cadr x) | |
| 1737 (list* 'block (car x) (cddr x)))))) | |
| 1738 (if (and (cl-compiling-file) | |
| 1739 (boundp 'byte-compile-function-environment)) | |
| 2153 | 1740 (push (cons (car x) (eval func)) |
| 428 | 1741 byte-compile-function-environment)) |
| 1742 (list (list 'symbol-function (list 'quote (car x))) func))) | |
| 1743 bindings) | |
| 1744 body)) | |
| 1745 | |
| 1746 ;;;###autoload | |
| 1747 (defmacro labels (bindings &rest body) | |
| 1748 "(labels ((FUNC ARGLIST BODY...) ...) FORM...): make temporary func bindings. | |
| 1749 This is like `flet', except the bindings are lexical instead of dynamic. | |
| 1750 Unlike `flet', this macro is fully compliant with the Common Lisp standard." | |
| 1751 (let ((vars nil) (sets nil) (cl-macro-environment cl-macro-environment)) | |
| 1752 (while bindings | |
| 1753 (let ((var (gensym))) | |
| 2153 | 1754 (push var vars) |
| 1755 (push (list 'function* (cons 'lambda (cdar bindings))) sets) | |
| 1756 (push var sets) | |
| 1757 (push (list (car (pop bindings)) 'lambda '(&rest cl-labels-args) | |
| 428 | 1758 (list 'list* '(quote funcall) (list 'quote var) |
| 1759 'cl-labels-args)) | |
| 1760 cl-macro-environment))) | |
| 1761 (cl-macroexpand-all (list* 'lexical-let vars (cons (cons 'setq sets) body)) | |
| 1762 cl-macro-environment))) | |
| 1763 | |
| 1764 ;; The following ought to have a better definition for use with newer | |
| 1765 ;; byte compilers. | |
| 1766 ;;;###autoload | |
| 1767 (defmacro macrolet (bindings &rest body) | |
| 1768 "(macrolet ((NAME ARGLIST BODY...) ...) FORM...): make temporary macro defns. | |
| 1769 This is like `flet', but for macros instead of functions." | |
| 1770 (if (cdr bindings) | |
| 1771 (list 'macrolet | |
| 1772 (list (car bindings)) (list* 'macrolet (cdr bindings) body)) | |
| 1773 (if (null bindings) (cons 'progn body) | |
| 1774 (let* ((name (caar bindings)) | |
| 1775 (res (cl-transform-lambda (cdar bindings) name))) | |
| 1776 (eval (car res)) | |
| 1777 (cl-macroexpand-all (cons 'progn body) | |
| 1778 (cons (list* name 'lambda (cdr res)) | |
| 1779 cl-macro-environment)))))) | |
| 1780 | |
| 1781 ;;;###autoload | |
| 1782 (defmacro symbol-macrolet (bindings &rest body) | |
| 1783 "(symbol-macrolet ((NAME EXPANSION) ...) FORM...): make symbol macro defns. | |
| 1784 Within the body FORMs, references to the variable NAME will be replaced | |
| 1785 by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...)." | |
| 1786 (if (cdr bindings) | |
| 1787 (list 'symbol-macrolet | |
| 1788 (list (car bindings)) (list* 'symbol-macrolet (cdr bindings) body)) | |
| 1789 (if (null bindings) (cons 'progn body) | |
| 1790 (cl-macroexpand-all (cons 'progn body) | |
| 1791 (cons (list (symbol-name (caar bindings)) | |
| 1792 (cadar bindings)) | |
| 1793 cl-macro-environment))))) | |
| 1794 | |
| 1795 (defvar cl-closure-vars nil) | |
| 1796 ;;;###autoload | |
| 1797 (defmacro lexical-let (bindings &rest body) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
1798 "Like `let', but lexically scoped. |
| 428 | 1799 The main visible difference is that lambdas inside BODY will create |
| 1800 lexical closures as in Common Lisp." | |
| 1801 (let* ((cl-closure-vars cl-closure-vars) | |
| 1802 (vars (mapcar #'(lambda (x) | |
| 1803 (or (consp x) (setq x (list x))) | |
| 2153 | 1804 (push (gensym (format "--%s--" (car x))) |
| 428 | 1805 cl-closure-vars) |
| 2153 | 1806 (set (car cl-closure-vars) [bad-lexical-ref]) |
| 428 | 1807 (list (car x) (cadr x) (car cl-closure-vars))) |
| 1808 bindings)) | |
| 1809 (ebody | |
| 1810 (cl-macroexpand-all | |
| 1811 (cons 'progn body) | |
| 1812 (nconc (mapcar #'(lambda (x) | |
| 1813 (list (symbol-name (car x)) | |
| 1814 (list 'symbol-value (caddr x)) | |
| 1815 t)) | |
| 1816 vars) | |
| 1817 (list '(defun . cl-defun-expander)) | |
| 1818 cl-macro-environment)))) | |
| 1819 (if (not (get (car (last cl-closure-vars)) 'used)) | |
| 1820 (list 'let (mapcar #'(lambda (x) (list (caddr x) (cadr x))) vars) | |
| 1821 (sublis (mapcar #'(lambda (x) | |
| 1822 (cons (caddr x) (list 'quote (caddr x)))) | |
| 1823 vars) | |
| 1824 ebody)) | |
| 1825 (list 'let (mapcar #'(lambda (x) | |
| 1826 (list (caddr x) | |
| 1827 (list 'make-symbol | |
| 1828 (format "--%s--" (car x))))) | |
| 1829 vars) | |
| 1830 (apply 'append '(setf) | |
| 1831 (mapcar #'(lambda (x) | |
| 1832 (list (list 'symbol-value (caddr x)) (cadr x))) | |
| 1833 vars)) | |
| 1834 ebody)))) | |
| 1835 | |
| 1836 ;;;###autoload | |
| 1837 (defmacro lexical-let* (bindings &rest body) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
1838 "Like `let*', but lexically scoped. |
| 428 | 1839 The main visible difference is that lambdas inside BODY will create |
| 1840 lexical closures as in Common Lisp." | |
| 1841 (if (null bindings) (cons 'progn body) | |
| 1842 (setq bindings (reverse bindings)) | |
| 1843 (while bindings | |
| 2153 | 1844 (setq body (list (list* 'lexical-let (list (pop bindings)) body)))) |
| 428 | 1845 (car body))) |
| 1846 | |
| 1847 (defun cl-defun-expander (func &rest rest) | |
| 1848 (list 'progn | |
| 1849 (list 'defalias (list 'quote func) | |
| 1850 (list 'function (cons 'lambda rest))) | |
| 1851 (list 'quote func))) | |
| 1852 | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1853 ;;; Multiple values. We support full Common Lisp conventions here. |
| 428 | 1854 |
| 1855 ;;;###autoload | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1856 (defmacro multiple-value-bind (syms form &rest body) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1857 "Collect and bind multiple return values. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1858 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1859 If FORM returns multiple values, each symbol in SYMS is bound to one of |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1860 them, in order, and BODY is executed. If FORM returns fewer multiple values |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1861 than there are SYMS, remaining SYMS are bound to nil. If FORM does |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1862 not return multiple values, it is treated as returning one multiple value. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1863 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1864 Returns the value given by the last element of BODY." |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1865 (if (null syms) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1866 `(progn ,form ,@body) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1867 (if (= 1 (length syms)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1868 ;; Code written to deal with other "implementations" of multiple |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1869 ;; values may have a one-element SYMS. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1870 `(let ((,(car syms) ,form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1871 ,@body) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1872 (let ((temp (gensym))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1873 `(let* ((,temp (multiple-value-list-internal 0 ,(length syms) ,form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1874 ,@(loop |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1875 for var in syms |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1876 collect `(,var (prog1 (car ,temp) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1877 (setq ,temp (cdr ,temp)))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1878 ,@body))))) |
| 428 | 1879 |
| 1880 ;;;###autoload | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1881 (defmacro multiple-value-setq (syms form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1882 "Collect and set multiple values. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1883 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1884 FORM should normally return multiple values; the first N values are stored |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1885 in the symbols in SYMS in turn. If FORM returns fewer than N values, the |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1886 remaining symbols have their values set to nil. FORM not returning multiple |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1887 values is treated as FORM returning one multiple value, with other elements |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1888 of SYMS initialized to nil. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1889 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1890 Returns the first of the multiple values given by FORM." |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1891 (if (null syms) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1892 ;; Never return multiple values from multiple-value-setq: |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1893 (and form `(values ,form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1894 (if (= 1 (length syms)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1895 `(setq ,(car syms) ,form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1896 (let ((temp (gensym))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1897 `(let* ((,temp (multiple-value-list-internal 0 ,(length syms) ,form))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1898 (setq ,@(loop |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1899 for sym in syms |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1900 nconc `(,sym (car-safe ,temp) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1901 ,temp (cdr-safe ,temp)))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1902 ,(car syms)))))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1903 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1904 ;;;###autoload |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1905 (defmacro multiple-value-list (form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1906 "Evaluate FORM and return a list of the multiple values it returned." |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1907 `(multiple-value-list-internal 0 multiple-values-limit ,form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1908 |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1909 ;;;###autoload |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1910 (defmacro nth-value (n form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1911 "Evaluate FORM and return the Nth multiple value it returned." |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1912 (if (integerp n) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1913 `(car (multiple-value-list-internal ,n ,(1+ n) ,form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1914 (let ((temp (gensym))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1915 `(let ((,temp ,n)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
1916 (car (multiple-value-list-internal ,temp (1+ ,temp) ,form)))))) |
| 428 | 1917 |
| 1918 ;;; Declarations. | |
| 1919 | |
| 1920 ;;;###autoload | |
| 1921 (defmacro locally (&rest body) (cons 'progn body)) | |
| 1922 ;;;###autoload | |
| 1923 (defmacro the (type form) form) | |
| 1924 | |
| 1925 (defvar cl-proclaim-history t) ; for future compilers | |
| 1926 (defvar cl-declare-stack t) ; for future compilers | |
| 1927 | |
| 1928 (defun cl-do-proclaim (spec hist) | |
| 2153 | 1929 (and hist (listp cl-proclaim-history) (push spec cl-proclaim-history)) |
| 428 | 1930 (cond ((eq (car-safe spec) 'special) |
| 1931 (if (boundp 'byte-compile-bound-variables) | |
| 1932 (setq byte-compile-bound-variables | |
| 442 | 1933 (append |
| 2153 | 1934 ;; XEmacs change |
| 442 | 1935 (mapcar #'(lambda (v) (cons v byte-compile-global-bit)) |
| 1936 (cdr spec)) | |
| 1937 byte-compile-bound-variables)))) | |
| 428 | 1938 |
| 1939 ((eq (car-safe spec) 'inline) | |
| 1940 (while (setq spec (cdr spec)) | |
| 1941 (or (memq (get (car spec) 'byte-optimizer) | |
| 1942 '(nil byte-compile-inline-expand)) | |
| 1943 (error "%s already has a byte-optimizer, can't make it inline" | |
| 1944 (car spec))) | |
| 1945 (put (car spec) 'byte-optimizer 'byte-compile-inline-expand))) | |
| 1946 | |
| 1947 ((eq (car-safe spec) 'notinline) | |
| 1948 (while (setq spec (cdr spec)) | |
| 1949 (if (eq (get (car spec) 'byte-optimizer) | |
| 1950 'byte-compile-inline-expand) | |
| 1951 (put (car spec) 'byte-optimizer nil)))) | |
| 1952 | |
| 1953 ((eq (car-safe spec) 'optimize) | |
| 1954 (let ((speed (assq (nth 1 (assq 'speed (cdr spec))) | |
| 446 | 1955 '((0 . nil) (1 . t) (2 . t) (3 . t)))) |
| 428 | 1956 (safety (assq (nth 1 (assq 'safety (cdr spec))) |
| 446 | 1957 '((0 . t) (1 . t) (2 . t) (3 . nil))))) |
| 1958 (when speed | |
| 1959 (setq cl-optimize-speed (car speed) | |
| 1960 byte-optimize (cdr speed))) | |
| 1961 (when safety | |
| 1962 (setq cl-optimize-safety (car safety) | |
| 1963 byte-compile-delete-errors (cdr safety))))) | |
| 428 | 1964 |
| 1965 ((and (eq (car-safe spec) 'warn) (boundp 'byte-compile-warnings)) | |
| 1966 (if (eq byte-compile-warnings t) | |
| 1967 ;; XEmacs change | |
| 1968 (setq byte-compile-warnings byte-compile-default-warnings)) | |
| 1969 (while (setq spec (cdr spec)) | |
| 1970 (if (consp (car spec)) | |
| 1971 (if (eq (cadar spec) 0) | |
| 1972 (setq byte-compile-warnings | |
| 1973 (delq (caar spec) byte-compile-warnings)) | |
| 1974 (setq byte-compile-warnings | |
| 1975 (adjoin (caar spec) byte-compile-warnings))))))) | |
| 1976 nil) | |
| 1977 | |
| 1978 ;;; Process any proclamations made before cl-macs was loaded. | |
| 1979 (defvar cl-proclaims-deferred) | |
| 1980 (let ((p (reverse cl-proclaims-deferred))) | |
| 2153 | 1981 (while p (cl-do-proclaim (pop p) t)) |
| 428 | 1982 (setq cl-proclaims-deferred nil)) |
| 1983 | |
| 1984 ;;;###autoload | |
| 1985 (defmacro declare (&rest specs) | |
| 1986 (if (cl-compiling-file) | |
| 1987 (while specs | |
| 2153 | 1988 (if (listp cl-declare-stack) (push (car specs) cl-declare-stack)) |
| 1989 (cl-do-proclaim (pop specs) nil))) | |
| 428 | 1990 nil) |
| 1991 | |
| 1992 | |
| 1993 | |
| 1994 ;;; Generalized variables. | |
| 1995 | |
| 1996 ;;;###autoload | |
| 1997 (defmacro define-setf-method (func args &rest body) | |
| 1998 "(define-setf-method NAME ARGLIST BODY...): define a `setf' method. | |
| 1999 This method shows how to handle `setf's to places of the form (NAME ARGS...). | |
| 2000 The argument forms ARGS are bound according to ARGLIST, as if NAME were | |
| 2001 going to be expanded as a macro, then the BODY forms are executed and must | |
| 2002 return a list of five elements: a temporary-variables list, a value-forms | |
| 2003 list, a store-variables list (of length one), a store-form, and an access- | |
| 2004 form. See `defsetf' for a simpler way to define most setf-methods." | |
| 2005 (append '(eval-when (compile load eval)) | |
| 2006 (if (stringp (car body)) | |
| 2007 (list (list 'put (list 'quote func) '(quote setf-documentation) | |
| 2153 | 2008 (pop body)))) |
| 428 | 2009 (list (cl-transform-function-property |
| 2010 func 'setf-method (cons args body))))) | |
| 2153 | 2011 (defalias 'define-setf-expander 'define-setf-method) |
| 428 | 2012 |
| 2013 ;;;###autoload | |
| 2014 (defmacro defsetf (func arg1 &rest args) | |
| 2015 "(defsetf NAME FUNC): define a `setf' method. | |
| 2016 This macro is an easy-to-use substitute for `define-setf-method' that works | |
| 2017 well for simple place forms. In the simple `defsetf' form, `setf's of | |
| 2018 the form (setf (NAME ARGS...) VAL) are transformed to function or macro | |
| 2019 calls of the form (FUNC ARGS... VAL). Example: (defsetf aref aset). | |
| 2020 Alternate form: (defsetf NAME ARGLIST (STORE) BODY...). | |
| 2021 Here, the above `setf' call is expanded by binding the argument forms ARGS | |
| 2022 according to ARGLIST, binding the value form VAL to STORE, then executing | |
| 2023 BODY, which must return a Lisp form that does the necessary `setf' operation. | |
| 2024 Actually, ARGLIST and STORE may be bound to temporary variables which are | |
| 2025 introduced automatically to preserve proper execution order of the arguments. | |
| 2026 Example: (defsetf nth (n x) (v) (list 'setcar (list 'nthcdr n x) v))." | |
| 2027 (if (listp arg1) | |
| 2028 (let* ((largs nil) (largsr nil) | |
| 2029 (temps nil) (tempsr nil) | |
| 2030 (restarg nil) (rest-temps nil) | |
| 2031 (store-var (car (prog1 (car args) (setq args (cdr args))))) | |
| 2032 (store-temp (intern (format "--%s--temp--" store-var))) | |
| 2033 (lets1 nil) (lets2 nil) | |
| 2034 (docstr nil) (p arg1)) | |
| 2035 (if (stringp (car args)) | |
| 2036 (setq docstr (prog1 (car args) (setq args (cdr args))))) | |
| 2037 (while (and p (not (eq (car p) '&aux))) | |
| 2038 (if (eq (car p) '&rest) | |
| 2039 (setq p (cdr p) restarg (car p)) | |
| 2040 (or (memq (car p) '(&optional &key &allow-other-keys)) | |
| 2041 (setq largs (cons (if (consp (car p)) (car (car p)) (car p)) | |
| 2042 largs) | |
| 2043 temps (cons (intern (format "--%s--temp--" (car largs))) | |
| 2044 temps)))) | |
| 2045 (setq p (cdr p))) | |
| 2046 (setq largs (nreverse largs) temps (nreverse temps)) | |
| 2047 (if restarg | |
| 2048 (setq largsr (append largs (list restarg)) | |
| 2049 rest-temps (intern (format "--%s--temp--" restarg)) | |
| 2050 tempsr (append temps (list rest-temps))) | |
| 2051 (setq largsr largs tempsr temps)) | |
| 2052 (let ((p1 largs) (p2 temps)) | |
| 2053 (while p1 | |
| 2054 (setq lets1 (cons (list (car p2) | |
| 2055 (list 'gensym (format "--%s--" (car p1)))) | |
| 2056 lets1) | |
| 2057 lets2 (cons (list (car p1) (car p2)) lets2) | |
| 2058 p1 (cdr p1) p2 (cdr p2)))) | |
| 2059 (if restarg (setq lets2 (cons (list restarg rest-temps) lets2))) | |
| 2060 (append (list 'define-setf-method func arg1) | |
| 2061 (and docstr (list docstr)) | |
| 2062 (list | |
| 2063 (list 'let* | |
| 2064 (nreverse | |
| 2065 (cons (list store-temp | |
| 2066 (list 'gensym (format "--%s--" store-var))) | |
| 2067 (if restarg | |
| 2068 (append | |
| 2069 (list | |
| 2070 (list rest-temps | |
| 2071 (list 'mapcar '(quote gensym) | |
| 2072 restarg))) | |
| 2073 lets1) | |
| 2074 lets1))) | |
| 2075 (list 'list ; 'values | |
| 2076 (cons (if restarg 'list* 'list) tempsr) | |
| 2077 (cons (if restarg 'list* 'list) largsr) | |
| 2078 (list 'list store-temp) | |
| 2079 (cons 'let* | |
| 2080 (cons (nreverse | |
| 2081 (cons (list store-var store-temp) | |
| 2082 lets2)) | |
| 2083 args)) | |
| 2084 (cons (if restarg 'list* 'list) | |
| 2085 (cons (list 'quote func) tempsr))))))) | |
| 2086 (list 'defsetf func '(&rest args) '(store) | |
| 2087 (let ((call (list 'cons (list 'quote arg1) | |
| 2088 '(append args (list store))))) | |
| 2089 (if (car args) | |
| 2090 (list 'list '(quote progn) call 'store) | |
| 2091 call))))) | |
| 2092 | |
| 2093 ;;; Some standard place types from Common Lisp. | |
| 2153 | 2094 (eval-when-compile (defvar ignored-arg)) ; XEmacs: warning suppression |
| 428 | 2095 (defsetf aref aset) |
| 2096 (defsetf car setcar) | |
| 2097 (defsetf cdr setcdr) | |
| 2153 | 2098 (defsetf caar (x) (val) (list 'setcar (list 'car x) val)) |
| 2099 (defsetf cadr (x) (val) (list 'setcar (list 'cdr x) val)) | |
| 2100 (defsetf cdar (x) (val) (list 'setcdr (list 'car x) val)) | |
| 2101 (defsetf cddr (x) (val) (list 'setcdr (list 'cdr x) val)) | |
| 428 | 2102 (defsetf elt (seq n) (store) |
| 2103 (list 'if (list 'listp seq) (list 'setcar (list 'nthcdr n seq) store) | |
| 2104 (list 'aset seq n store))) | |
| 2153 | 2105 ;; XEmacs change: ignore the optional DEFAULT arguments |
| 428 | 2106 (defsetf get (x y &optional ignored-arg) (store) (list 'put x y store)) |
| 2107 (defsetf get* (x y &optional ignored-arg) (store) (list 'put x y store)) | |
| 2153 | 2108 (defsetf gethash (x h &optional ignored-arg) (store) (list 'puthash x store h)) |
| 428 | 2109 (defsetf nth (n x) (store) (list 'setcar (list 'nthcdr n x) store)) |
| 2110 (defsetf subseq (seq start &optional end) (new) | |
| 2153 | 2111 (list 'progn (list 'replace seq new :start1 start :end1 end) new)) |
| 428 | 2112 (defsetf symbol-function fset) |
| 2113 (defsetf symbol-plist setplist) | |
| 2114 (defsetf symbol-value set) | |
| 2115 | |
| 2116 ;;; Various car/cdr aliases. Note that `cadr' is handled specially. | |
| 2117 (defsetf first setcar) | |
| 2118 (defsetf second (x) (store) (list 'setcar (list 'cdr x) store)) | |
| 2119 (defsetf third (x) (store) (list 'setcar (list 'cddr x) store)) | |
| 2120 (defsetf fourth (x) (store) (list 'setcar (list 'cdddr x) store)) | |
| 2121 (defsetf fifth (x) (store) (list 'setcar (list 'nthcdr 4 x) store)) | |
| 2122 (defsetf sixth (x) (store) (list 'setcar (list 'nthcdr 5 x) store)) | |
| 2123 (defsetf seventh (x) (store) (list 'setcar (list 'nthcdr 6 x) store)) | |
| 2124 (defsetf eighth (x) (store) (list 'setcar (list 'nthcdr 7 x) store)) | |
| 2125 (defsetf ninth (x) (store) (list 'setcar (list 'nthcdr 8 x) store)) | |
| 2126 (defsetf tenth (x) (store) (list 'setcar (list 'nthcdr 9 x) store)) | |
| 2127 (defsetf rest setcdr) | |
| 2128 | |
| 2129 ;;; Some more Emacs-related place types. | |
| 2130 (defsetf buffer-file-name set-visited-file-name t) | |
| 2153 | 2131 ;; XEmacs change: we do not need to wrap this in with-current-buffer |
| 428 | 2132 (defsetf buffer-modified-p set-buffer-modified-p t) |
| 2133 (defsetf buffer-name rename-buffer t) | |
| 2134 (defsetf buffer-string () (store) | |
| 2135 (list 'progn '(erase-buffer) (list 'insert store))) | |
| 2136 (defsetf buffer-substring cl-set-buffer-substring) | |
| 2137 (defsetf current-buffer set-buffer) | |
| 2138 (defsetf current-case-table set-case-table) | |
| 2139 (defsetf current-column move-to-column t) | |
| 2140 (defsetf current-global-map use-global-map t) | |
| 2141 (defsetf current-input-mode () (store) | |
| 2142 (list 'progn (list 'apply 'set-input-mode store) store)) | |
| 2143 (defsetf current-local-map use-local-map t) | |
| 2144 (defsetf current-window-configuration set-window-configuration t) | |
| 2145 (defsetf default-file-modes set-default-file-modes t) | |
| 2146 (defsetf default-value set-default) | |
| 2147 (defsetf documentation-property put) | |
| 2153 | 2148 ;;(defsetf extent-data set-extent-data) |
| 428 | 2149 (defsetf extent-face set-extent-face) |
| 2150 (defsetf extent-priority set-extent-priority) | |
| 2153 | 2151 ;; XEmacs addition |
| 428 | 2152 (defsetf extent-property (x y &optional ignored-arg) (arg) |
| 2153 (list 'set-extent-property x y arg)) | |
| 2153 | 2154 (defsetf extent-end-position (ext) (store) |
| 2155 `(progn (set-extent-endpoints ,ext (extent-start-position ,ext) ,store) | |
| 2156 ,store)) | |
| 428 | 2157 (defsetf extent-start-position (ext) (store) |
| 2158 `(progn (set-extent-endpoints ,ext ,store (extent-end-position ,ext)) | |
| 2159 ,store)) | |
| 2160 (defsetf face-background (f &optional s) (x) (list 'set-face-background f x s)) | |
| 2161 (defsetf face-background-pixmap (f &optional s) (x) | |
| 2162 (list 'set-face-background-pixmap f x s)) | |
| 2163 (defsetf face-font (f &optional s) (x) (list 'set-face-font f x s)) | |
| 2164 (defsetf face-foreground (f &optional s) (x) (list 'set-face-foreground f x s)) | |
| 2165 (defsetf face-underline-p (f &optional s) (x) | |
| 2166 (list 'set-face-underline-p f x s)) | |
| 2167 (defsetf file-modes set-file-modes t) | |
| 2153 | 2168 (defsetf frame-height (&optional f) (v) |
| 2169 `(progn (set-frame-height ,f ,v) ,v)) | |
| 428 | 2170 (defsetf frame-parameters modify-frame-parameters t) |
| 2171 (defsetf frame-visible-p cl-set-frame-visible-p) | |
| 2153 | 2172 (defsetf frame-width (&optional f) (v) |
| 2173 `(progn (set-frame-width ,f ,v) ,v)) | |
| 2174 ;; XEmacs change: frame-properties instead of frame-parameters | |
| 428 | 2175 (defsetf frame-properties (&optional f) (p) |
| 2176 `(progn (set-frame-properties ,f ,p) ,p)) | |
| 2177 (defsetf frame-property (f p &optional ignored-arg) (v) | |
| 2178 `(progn (set-frame-property ,f ,v) ,p)) | |
| 2153 | 2179 ;; XEmacs addition |
| 428 | 2180 (defsetf current-frame-configuration set-frame-configuration) |
| 2181 | |
| 2182 ;; XEmacs: new stuff | |
| 2183 ;; Consoles | |
| 2184 (defsetf selected-console select-console t) | |
| 2185 (defsetf selected-device select-device t) | |
| 2186 (defsetf device-baud-rate (&optional d) (v) | |
| 2187 `(set-device-baud-rate ,d ,v)) | |
| 2188 ;; This setf method is a bad idea, because set-specifier *adds* a | |
| 2189 ;; specification, rather than just setting it. The net effect is that | |
| 2190 ;; it makes specifier-instance return VAL, but other things don't work | |
| 2191 ;; as expected -- letf, to name one. | |
| 2192 ;(defsetf specifier-instance (spec &optional dom def nof) (val) | |
| 2193 ; `(set-specifier ,spec ,val ,dom)) | |
| 2194 | |
| 2195 ;; Annotations | |
| 2196 (defsetf annotation-glyph set-annotation-glyph) | |
| 2197 (defsetf annotation-down-glyph set-annotation-down-glyph) | |
| 2198 (defsetf annotation-face set-annotation-face) | |
| 2199 (defsetf annotation-layout set-annotation-layout) | |
| 2200 (defsetf annotation-data set-annotation-data) | |
| 2201 (defsetf annotation-action set-annotation-action) | |
| 2202 (defsetf annotation-menu set-annotation-menu) | |
| 2203 ;; Widget | |
| 2204 (defsetf widget-get widget-put t) | |
| 2205 (defsetf widget-value widget-value-set t) | |
| 2206 | |
| 2207 ;; Misc | |
| 2208 (defsetf recent-keys-ring-size set-recent-keys-ring-size) | |
| 2209 (defsetf symbol-value-in-buffer (s b &optional ignored-arg) (store) | |
| 2210 `(with-current-buffer ,b (set ,s ,store))) | |
| 2211 (defsetf symbol-value-in-console (s c &optional ignored-arg) (store) | |
| 2212 `(letf (((selected-console) ,c)) | |
| 2213 (set ,s ,store))) | |
| 2214 | |
| 2215 (defsetf buffer-dedicated-frame (&optional b) (v) | |
| 2216 `(set-buffer-dedicated-frame ,b ,v)) | |
| 2217 (defsetf console-type-image-conversion-list | |
| 2218 set-console-type-image-conversion-list) | |
| 2219 (defsetf default-toolbar-position set-default-toolbar-position) | |
| 2220 (defsetf device-class (&optional d) (v) | |
| 2221 `(set-device-class ,d ,v)) | |
| 2222 (defsetf extent-begin-glyph set-extent-begin-glyph) | |
| 2223 (defsetf extent-begin-glyph-layout set-extent-begin-glyph-layout) | |
| 2224 (defsetf extent-end-glyph set-extent-end-glyph) | |
| 2225 (defsetf extent-end-glyph-layout set-extent-end-glyph-layout) | |
| 2226 (defsetf extent-keymap set-extent-keymap) | |
| 2227 (defsetf extent-parent set-extent-parent) | |
| 2228 (defsetf extent-properties set-extent-properties) | |
| 2229 ;; Avoid adding various face and glyph functions. | |
| 2230 (defsetf frame-selected-window (&optional f) (v) | |
| 2231 `(set-frame-selected-window ,f ,v)) | |
| 2232 (defsetf glyph-image (glyph &optional domain) (i) | |
| 2233 (list 'set-glyph-image glyph i domain)) | |
| 2234 (defsetf itimer-function set-itimer-function) | |
| 2235 (defsetf itimer-function-arguments set-itimer-function-arguments) | |
| 2236 (defsetf itimer-is-idle set-itimer-is-idle) | |
| 2237 (defsetf itimer-recorded-run-time set-itimer-recorded-run-time) | |
| 2238 (defsetf itimer-restart set-itimer-restart) | |
| 2239 (defsetf itimer-uses-arguments set-itimer-uses-arguments) | |
| 2240 (defsetf itimer-value set-itimer-value) | |
| 2241 (defsetf keymap-parents set-keymap-parents) | |
| 2242 (defsetf marker-insertion-type set-marker-insertion-type) | |
| 2243 (defsetf mouse-pixel-position (&optional d) (v) | |
| 2244 `(progn | |
| 2245 (set-mouse-pixel-position ,d ,(car v) ,(car (cdr v)) ,(cdr (cdr v))) | |
| 2246 ,v)) | |
| 2247 (defsetf trunc-stack-length set-trunc-stack-length) | |
| 2248 (defsetf trunc-stack-stack set-trunc-stack-stack) | |
| 2249 (defsetf undoable-stack-max set-undoable-stack-max) | |
| 2250 (defsetf weak-list-list set-weak-list-list) | |
| 2153 | 2251 ;; End of new XEmacs stuff |
| 428 | 2252 |
| 2253 (defsetf getenv setenv t) | |
| 2254 (defsetf get-register set-register) | |
| 2255 (defsetf global-key-binding global-set-key) | |
| 2256 (defsetf keymap-parent set-keymap-parent) | |
| 2153 | 2257 ;; XEmacs addition: more keymap-related setf forms |
| 428 | 2258 (defsetf keymap-name set-keymap-name) |
| 2259 (defsetf keymap-prompt set-keymap-prompt) | |
| 2260 (defsetf keymap-default-binding set-keymap-default-binding) | |
| 2261 (defsetf local-key-binding local-set-key) | |
| 2262 (defsetf mark set-mark t) | |
| 2263 (defsetf mark-marker set-mark t) | |
| 2264 (defsetf marker-position set-marker t) | |
| 2265 (defsetf match-data store-match-data t) | |
| 2266 (defsetf mouse-position (scr) (store) | |
| 2267 (list 'set-mouse-position scr (list 'car store) (list 'cadr store) | |
| 2268 (list 'cddr store))) | |
| 2269 (defsetf overlay-get overlay-put) | |
| 2270 (defsetf overlay-start (ov) (store) | |
| 2271 (list 'progn (list 'move-overlay ov store (list 'overlay-end ov)) store)) | |
| 2272 (defsetf overlay-end (ov) (store) | |
| 2273 (list 'progn (list 'move-overlay ov (list 'overlay-start ov) store) store)) | |
| 2274 (defsetf point goto-char) | |
| 2275 (defsetf point-marker goto-char t) | |
| 2276 (defsetf point-max () (store) | |
| 2277 (list 'progn (list 'narrow-to-region '(point-min) store) store)) | |
| 2278 (defsetf point-min () (store) | |
| 2279 (list 'progn (list 'narrow-to-region store '(point-max)) store)) | |
| 2280 (defsetf process-buffer set-process-buffer) | |
| 2281 (defsetf process-filter set-process-filter) | |
| 2282 (defsetf process-sentinel set-process-sentinel) | |
| 2153 | 2283 ;;(defsetf process-get process-put) |
| 428 | 2284 (defsetf read-mouse-position (scr) (store) |
| 2285 (list 'set-mouse-position scr (list 'car store) (list 'cdr store))) | |
| 2153 | 2286 ;;(defsetf screen-height set-screen-height t) |
| 2287 ;;(defsetf screen-width set-screen-width t) | |
| 428 | 2288 (defsetf selected-window select-window) |
| 2153 | 2289 ;;(defsetf selected-screen select-screen) |
| 428 | 2290 (defsetf selected-frame select-frame) |
| 2291 (defsetf standard-case-table set-standard-case-table) | |
| 2292 (defsetf syntax-table set-syntax-table) | |
| 2293 (defsetf visited-file-modtime set-visited-file-modtime t) | |
| 2294 (defsetf window-buffer set-window-buffer t) | |
| 2295 (defsetf window-display-table set-window-display-table t) | |
| 2296 (defsetf window-dedicated-p set-window-dedicated-p t) | |
| 2297 (defsetf window-height (&optional window) (store) | |
| 2298 `(progn (enlarge-window (- ,store (window-height)) nil ,window) ,store)) | |
| 2299 (defsetf window-hscroll set-window-hscroll) | |
| 2300 (defsetf window-point set-window-point) | |
| 2301 (defsetf window-start set-window-start) | |
| 2302 (defsetf window-width (&optional window) (store) | |
| 2303 `(progn (enlarge-window (- ,store (window-width)) t ,window) ,store)) | |
| 2304 (defsetf x-get-cutbuffer x-store-cutbuffer t) | |
| 2305 (defsetf x-get-cut-buffer x-store-cut-buffer t) ; groan. | |
| 2306 (defsetf x-get-secondary-selection x-own-secondary-selection t) | |
| 2307 (defsetf x-get-selection x-own-selection t) | |
| 442 | 2308 (defsetf get-selection own-selection t) |
| 428 | 2309 |
| 2310 ;;; More complex setf-methods. | |
| 2311 ;;; These should take &environment arguments, but since full arglists aren't | |
| 2312 ;;; available while compiling cl-macs, we fake it by referring to the global | |
| 2313 ;;; variable cl-macro-environment directly. | |
| 2314 | |
| 2315 (define-setf-method apply (func arg1 &rest rest) | |
| 2316 (or (and (memq (car-safe func) '(quote function function*)) | |
| 2317 (symbolp (car-safe (cdr-safe func)))) | |
| 2318 (error "First arg to apply in setf is not (function SYM): %s" func)) | |
| 2319 (let* ((form (cons (nth 1 func) (cons arg1 rest))) | |
| 2320 (method (get-setf-method form cl-macro-environment))) | |
| 2321 (list (car method) (nth 1 method) (nth 2 method) | |
| 2322 (cl-setf-make-apply (nth 3 method) (cadr func) (car method)) | |
| 2323 (cl-setf-make-apply (nth 4 method) (cadr func) (car method))))) | |
| 2324 | |
| 2325 (defun cl-setf-make-apply (form func temps) | |
| 2326 (if (eq (car form) 'progn) | |
| 2327 (list* 'progn (cl-setf-make-apply (cadr form) func temps) (cddr form)) | |
| 2328 (or (equal (last form) (last temps)) | |
| 2329 (error "%s is not suitable for use with setf-of-apply" func)) | |
| 2330 (list* 'apply (list 'quote (car form)) (cdr form)))) | |
| 2331 | |
| 2332 (define-setf-method nthcdr (n place) | |
| 2333 (let ((method (get-setf-method place cl-macro-environment)) | |
| 2334 (n-temp (gensym "--nthcdr-n--")) | |
| 2335 (store-temp (gensym "--nthcdr-store--"))) | |
| 2336 (list (cons n-temp (car method)) | |
| 2337 (cons n (nth 1 method)) | |
| 2338 (list store-temp) | |
| 2339 (list 'let (list (list (car (nth 2 method)) | |
| 2340 (list 'cl-set-nthcdr n-temp (nth 4 method) | |
| 2341 store-temp))) | |
| 2342 (nth 3 method) store-temp) | |
| 2343 (list 'nthcdr n-temp (nth 4 method))))) | |
| 2344 | |
| 2345 (define-setf-method getf (place tag &optional def) | |
| 2346 (let ((method (get-setf-method place cl-macro-environment)) | |
| 2347 (tag-temp (gensym "--getf-tag--")) | |
| 2348 (def-temp (gensym "--getf-def--")) | |
| 2349 (store-temp (gensym "--getf-store--"))) | |
| 2350 (list (append (car method) (list tag-temp def-temp)) | |
| 2351 (append (nth 1 method) (list tag def)) | |
| 2352 (list store-temp) | |
| 2353 (list 'let (list (list (car (nth 2 method)) | |
| 2354 (list 'cl-set-getf (nth 4 method) | |
| 2355 tag-temp store-temp))) | |
| 2356 (nth 3 method) store-temp) | |
| 2357 (list 'getf (nth 4 method) tag-temp def-temp)))) | |
| 2358 | |
| 2359 (define-setf-method substring (place from &optional to) | |
| 2360 (let ((method (get-setf-method place cl-macro-environment)) | |
| 2361 (from-temp (gensym "--substring-from--")) | |
| 2362 (to-temp (gensym "--substring-to--")) | |
| 2363 (store-temp (gensym "--substring-store--"))) | |
| 2364 (list (append (car method) (list from-temp to-temp)) | |
| 2365 (append (nth 1 method) (list from to)) | |
| 2366 (list store-temp) | |
| 2367 (list 'let (list (list (car (nth 2 method)) | |
| 2368 (list 'cl-set-substring (nth 4 method) | |
| 2369 from-temp to-temp store-temp))) | |
| 2370 (nth 3 method) store-temp) | |
| 2371 (list 'substring (nth 4 method) from-temp to-temp)))) | |
| 2372 | |
| 2153 | 2373 ;; XEmacs addition |
| 428 | 2374 (define-setf-method values (&rest args) |
| 2375 (let ((methods (mapcar #'(lambda (x) | |
| 2376 (get-setf-method x cl-macro-environment)) | |
| 2377 args)) | |
| 2378 (store-temp (gensym "--values-store--"))) | |
| 2379 (list (apply 'append (mapcar 'first methods)) | |
| 2380 (apply 'append (mapcar 'second methods)) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2381 `((,store-temp |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2382 (multiple-value-list-internal 0 ,(if args (length args) 1)))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2383 (cons 'values |
| 428 | 2384 (mapcar #'(lambda (m) |
| 2385 (cl-setf-do-store (cons (car (third m)) (fourth m)) | |
| 2386 (list 'pop store-temp))) | |
| 2387 methods)) | |
| 2388 (cons 'list (mapcar 'fifth methods))))) | |
| 2389 | |
| 2390 ;;; Getting and optimizing setf-methods. | |
| 2391 ;;;###autoload | |
| 2392 (defun get-setf-method (place &optional env) | |
| 2393 "Return a list of five values describing the setf-method for PLACE. | |
| 2394 PLACE may be any Lisp form which can appear as the PLACE argument to | |
| 2395 a macro like `setf' or `incf'." | |
| 2396 (if (symbolp place) | |
| 2397 (let ((temp (gensym "--setf--"))) | |
| 2398 (list nil nil (list temp) (list 'setq place temp) place)) | |
| 2399 (or (and (symbolp (car place)) | |
| 2400 (let* ((func (car place)) | |
| 2401 (name (symbol-name func)) | |
| 2402 (method (get func 'setf-method)) | |
| 2403 (case-fold-search nil)) | |
| 2404 (or (and method | |
| 2405 (let ((cl-macro-environment env)) | |
| 2406 (setq method (apply method (cdr place)))) | |
| 2407 (if (and (consp method) (= (length method) 5)) | |
| 2408 method | |
| 2409 (error "Setf-method for %s returns malformed method" | |
| 2410 func))) | |
| 2411 (and (save-match-data | |
| 2412 (string-match "\\`c[ad][ad][ad]?[ad]?r\\'" name)) | |
| 2413 (get-setf-method (compiler-macroexpand place))) | |
| 2414 (and (eq func 'edebug-after) | |
| 2415 (get-setf-method (nth (1- (length place)) place) | |
| 2416 env))))) | |
| 2417 (if (eq place (setq place (macroexpand place env))) | |
| 2418 (if (and (symbolp (car place)) (fboundp (car place)) | |
| 2419 (symbolp (symbol-function (car place)))) | |
| 2420 (get-setf-method (cons (symbol-function (car place)) | |
| 2421 (cdr place)) env) | |
| 2422 (error "No setf-method known for %s" (car place))) | |
| 2423 (get-setf-method place env))))) | |
| 2424 | |
| 2425 (defun cl-setf-do-modify (place opt-expr) | |
| 2426 (let* ((method (get-setf-method place cl-macro-environment)) | |
| 2427 (temps (car method)) (values (nth 1 method)) | |
| 2428 (lets nil) (subs nil) | |
| 2429 (optimize (and (not (eq opt-expr 'no-opt)) | |
| 2430 (or (and (not (eq opt-expr 'unsafe)) | |
| 2431 (cl-safe-expr-p opt-expr)) | |
| 2432 (cl-setf-simple-store-p (car (nth 2 method)) | |
| 2433 (nth 3 method))))) | |
| 2434 (simple (and optimize (consp place) (cl-simple-exprs-p (cdr place))))) | |
| 2435 (while values | |
| 2436 (if (or simple (cl-const-expr-p (car values))) | |
| 2153 | 2437 (push (cons (pop temps) (pop values)) subs) |
| 2438 (push (list (pop temps) (pop values)) lets))) | |
| 428 | 2439 (list (nreverse lets) |
| 2440 (cons (car (nth 2 method)) (sublis subs (nth 3 method))) | |
| 2441 (sublis subs (nth 4 method))))) | |
| 2442 | |
| 2443 (defun cl-setf-do-store (spec val) | |
| 2444 (let ((sym (car spec)) | |
| 2445 (form (cdr spec))) | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2446 (if (consp sym) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2447 ;; XEmacs change, only used for implementing #'values at the moment. |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2448 (let* ((orig (copy-list sym)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2449 (intermediate (last orig)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2450 (circular-limit 32)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2451 (while (consp (car intermediate)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2452 (when (zerop circular-limit) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2453 (error 'circular-list "Form seems to contain loops")) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2454 (setq intermediate (last (car intermediate)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2455 circular-limit (1- circular-limit))) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2456 (setcdr intermediate (list val)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2457 `(let (,orig) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2458 ,form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2459 (if (or (cl-const-expr-p val) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2460 (and (cl-simple-expr-p val) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2461 (eq (cl-expr-contains form sym) 1)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2462 (cl-setf-simple-store-p sym form)) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2463 (subst val sym form) |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4607
diff
changeset
|
2464 (list 'let (list (list sym val)) form))))) |
| 428 | 2465 |
| 2466 (defun cl-setf-simple-store-p (sym form) | |
| 2467 (and (consp form) (eq (cl-expr-contains form sym) 1) | |
| 2468 (eq (nth (1- (length form)) form) sym) | |
| 2469 (symbolp (car form)) (fboundp (car form)) | |
| 2470 (not (eq (car-safe (symbol-function (car form))) 'macro)))) | |
| 2471 | |
| 2472 ;;; The standard modify macros. | |
| 2473 ;;;###autoload | |
| 2474 (defmacro setf (&rest args) | |
| 2475 "(setf PLACE VAL PLACE VAL ...): set each PLACE to the value of its VAL. | |
| 2476 This is a generalized version of `setq'; the PLACEs may be symbolic | |
| 2477 references such as (car x) or (aref x i), as well as plain symbols. | |
| 2478 For example, (setf (cadar x) y) is equivalent to (setcar (cdar x) y). | |
| 2479 The return value is the last VAL in the list." | |
| 2480 (if (cdr (cdr args)) | |
| 2481 (let ((sets nil)) | |
| 2153 | 2482 (while args (push (list 'setf (pop args) (pop args)) sets)) |
| 428 | 2483 (cons 'progn (nreverse sets))) |
| 2484 (if (symbolp (car args)) | |
| 2485 (and args (cons 'setq args)) | |
| 2486 (let* ((method (cl-setf-do-modify (car args) (nth 1 args))) | |
| 2487 (store (cl-setf-do-store (nth 1 method) (nth 1 args)))) | |
| 2488 (if (car method) (list 'let* (car method) store) store))))) | |
| 2489 | |
| 2490 ;;;###autoload | |
| 2491 (defmacro psetf (&rest args) | |
| 2492 "(psetf PLACE VAL PLACE VAL ...): set PLACEs to the values VALs in parallel. | |
| 2493 This is like `setf', except that all VAL forms are evaluated (in order) | |
| 2494 before assigning any PLACEs to the corresponding values." | |
| 2495 (let ((p args) (simple t) (vars nil)) | |
| 2496 (while p | |
| 2497 (if (or (not (symbolp (car p))) (cl-expr-depends-p (nth 1 p) vars)) | |
| 2498 (setq simple nil)) | |
| 2499 (if (memq (car p) vars) | |
| 2500 (error "Destination duplicated in psetf: %s" (car p))) | |
| 2153 | 2501 (push (pop p) vars) |
| 428 | 2502 (or p (error "Odd number of arguments to psetf")) |
| 2153 | 2503 (pop p)) |
| 428 | 2504 (if simple |
| 2505 (list 'progn (cons 'setf args) nil) | |
| 2506 (setq args (reverse args)) | |
| 2507 (let ((expr (list 'setf (cadr args) (car args)))) | |
| 2508 (while (setq args (cddr args)) | |
| 2509 (setq expr (list 'setf (cadr args) (list 'prog1 (car args) expr)))) | |
| 2510 (list 'progn expr nil))))) | |
| 2511 | |
| 2512 ;;;###autoload | |
| 2513 (defun cl-do-pop (place) | |
| 2514 (if (cl-simple-expr-p place) | |
| 2515 (list 'prog1 (list 'car place) (list 'setf place (list 'cdr place))) | |
| 2516 (let* ((method (cl-setf-do-modify place t)) | |
| 2517 (temp (gensym "--pop--"))) | |
| 2518 (list 'let* | |
| 2519 (append (car method) | |
| 2520 (list (list temp (nth 2 method)))) | |
| 2521 (list 'prog1 | |
| 2522 (list 'car temp) | |
| 2523 (cl-setf-do-store (nth 1 method) (list 'cdr temp))))))) | |
| 2524 | |
| 2525 ;;;###autoload | |
| 2526 (defmacro remf (place tag) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
2527 "Remove TAG from property list PLACE. |
| 428 | 2528 PLACE may be a symbol, or any generalized variable allowed by `setf'. |
| 2529 The form returns true if TAG was found and removed, nil otherwise." | |
| 2530 (let* ((method (cl-setf-do-modify place t)) | |
| 2531 (tag-temp (and (not (cl-const-expr-p tag)) (gensym "--remf-tag--"))) | |
| 2532 (val-temp (and (not (cl-simple-expr-p place)) | |
| 2533 (gensym "--remf-place--"))) | |
| 2534 (ttag (or tag-temp tag)) | |
| 2535 (tval (or val-temp (nth 2 method)))) | |
| 2536 (list 'let* | |
| 2537 (append (car method) | |
| 2538 (and val-temp (list (list val-temp (nth 2 method)))) | |
| 2539 (and tag-temp (list (list tag-temp tag)))) | |
| 2540 (list 'if (list 'eq ttag (list 'car tval)) | |
| 2541 (list 'progn | |
| 2542 (cl-setf-do-store (nth 1 method) (list 'cddr tval)) | |
| 2543 t) | |
| 2544 (list 'cl-do-remf tval ttag))))) | |
| 2545 | |
| 2546 ;;;###autoload | |
| 2547 (defmacro shiftf (place &rest args) | |
| 2548 "(shiftf PLACE PLACE... VAL): shift left among PLACEs. | |
| 2549 Example: (shiftf A B C) sets A to B, B to C, and returns the old A. | |
| 2550 Each PLACE may be a symbol, or any generalized variable allowed by `setf'." | |
| 2153 | 2551 ;; XEmacs change: use iteration instead of recursion |
| 428 | 2552 (if (not (memq nil (mapcar 'symbolp (butlast (cons place args))))) |
| 2553 (list* 'prog1 place | |
| 2554 (let ((sets nil)) | |
| 2555 (while args | |
| 2153 | 2556 (push (list 'setq place (car args)) sets) |
| 2557 (setq place (pop args))) | |
| 428 | 2558 (nreverse sets))) |
| 2559 (let* ((places (reverse (cons place args))) | |
| 2153 | 2560 (form (pop places))) |
| 428 | 2561 (while places |
| 2153 | 2562 (let ((method (cl-setf-do-modify (pop places) 'unsafe))) |
| 428 | 2563 (setq form (list 'let* (car method) |
| 2564 (list 'prog1 (nth 2 method) | |
| 2565 (cl-setf-do-store (nth 1 method) form)))))) | |
| 2566 form))) | |
| 2567 | |
| 2568 ;;;###autoload | |
| 2569 (defmacro rotatef (&rest args) | |
| 2570 "(rotatef PLACE...): rotate left among PLACEs. | |
| 2571 Example: (rotatef A B C) sets A to B, B to C, and C to A. It returns nil. | |
| 2572 Each PLACE may be a symbol, or any generalized variable allowed by `setf'." | |
| 2573 (if (not (memq nil (mapcar 'symbolp args))) | |
| 2574 (and (cdr args) | |
| 2575 (let ((sets nil) | |
| 2576 (first (car args))) | |
| 2577 (while (cdr args) | |
| 2153 | 2578 (setq sets (nconc sets (list (pop args) (car args))))) |
| 428 | 2579 (nconc (list 'psetf) sets (list (car args) first)))) |
| 2580 (let* ((places (reverse args)) | |
| 2581 (temp (gensym "--rotatef--")) | |
| 2582 (form temp)) | |
| 2583 (while (cdr places) | |
| 2153 | 2584 (let ((method (cl-setf-do-modify (pop places) 'unsafe))) |
| 428 | 2585 (setq form (list 'let* (car method) |
| 2586 (list 'prog1 (nth 2 method) | |
| 2587 (cl-setf-do-store (nth 1 method) form)))))) | |
| 2588 (let ((method (cl-setf-do-modify (car places) 'unsafe))) | |
| 2589 (list 'let* (append (car method) (list (list temp (nth 2 method)))) | |
| 2590 (cl-setf-do-store (nth 1 method) form) nil))))) | |
| 2591 | |
|
4742
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2592 ;; This function is not in Common Lisp, and there are gaps in its structure and |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2593 ;; implementation that reflect that it was never well-specified. E.g. with |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2594 ;; setf, the question of whether a PLACE is bound or not and how to make it |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2595 ;; unbound doesn't arise, but we need some way of specifying that for letf to |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2596 ;; be sensible for gethash, symbol-value and so on; currently we just hard-code |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2597 ;; symbol-value, symbol-function and values (the latter is XEmacs work that |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2598 ;; I've just done) in the body of this function, and the following gives the |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2599 ;; wrong behaviour for gethash: |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2600 ;; |
|
4820
e6dec75ded0e
Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4810
diff
changeset
|
2601 ;; (setq my-hash-table #s(hash-table :test equal :data ()) |
|
4742
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2602 ;; print-gensym t) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2603 ;; => t |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2604 ;; (gethash "my-key" my-hash-table (gensym)) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2605 ;; => #:G68010 |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2606 ;; (letf (((gethash "my-key" my-hash-table) 4000)) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2607 ;; (message "key value is %S" (gethash "my-key" my-hash-table))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2608 ;; => "key value is 4000" |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2609 ;; (gethash "my-key" my-hash-table (gensym)) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2610 ;; => nil ;; should be an uninterned symbol. |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2611 ;; |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2612 ;; Aidan Kehoe, Fr Nov 13 16:12:21 GMT 2009 |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2613 |
| 428 | 2614 ;;;###autoload |
| 2615 (defmacro letf (bindings &rest body) | |
| 2616 "(letf ((PLACE VALUE) ...) BODY...): temporarily bind to PLACEs. | |
| 2617 This is the analogue of `let', but with generalized variables (in the | |
| 2618 sense of `setf') for the PLACEs. Each PLACE is set to the corresponding | |
| 2619 VALUE, then the BODY forms are executed. On exit, either normally or | |
| 2620 because of a `throw' or error, the PLACEs are set back to their original | |
| 2621 values. Note that this macro is *not* available in Common Lisp. | |
| 2622 As a special case, if `(PLACE)' is used instead of `(PLACE VALUE)', | |
| 2623 the PLACE is not modified before executing BODY." | |
| 2624 (if (and (not (cdr bindings)) (cdar bindings) (symbolp (caar bindings))) | |
| 2625 (list* 'let bindings body) | |
| 2626 (let ((lets nil) | |
| 2627 (rev (reverse bindings))) | |
| 2628 (while rev | |
| 2629 (let* ((place (if (symbolp (caar rev)) | |
| 2630 (list 'symbol-value (list 'quote (caar rev))) | |
| 2631 (caar rev))) | |
| 2632 (value (cadar rev)) | |
| 2633 (method (cl-setf-do-modify place 'no-opt)) | |
| 2634 (save (gensym "--letf-save--")) | |
|
4742
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2635 (bound (and (memq (car place) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2636 '(symbol-value symbol-function values)) |
| 428 | 2637 (gensym "--letf-bound--"))) |
| 2638 (temp (and (not (cl-const-expr-p value)) (cdr bindings) | |
|
4742
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2639 (gensym "--letf-val--"))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2640 (syms (and (eq 'values (car place)) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2641 (gensym "--letf-syms--"))) |
|
4783
e29fcfd8df5f
Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4742
diff
changeset
|
2642 (cursor (and syms (gensym "--letf-cursor--")))) |
| 428 | 2643 (setq lets (nconc (car method) |
|
4742
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2644 (cond |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2645 (syms |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2646 `((,syms ',(loop |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2647 for sym in (cdr place) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2648 nconc (if (symbolp sym) (list sym)))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2649 (,cursor ,syms) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2650 (,bound nil) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2651 (,save |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2652 (prog2 |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2653 (while (consp ,cursor) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2654 (setq ,bound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2655 (cons (and (boundp (car ,cursor)) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2656 (symbol-value |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2657 (car ,cursor))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2658 ,bound) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2659 ,cursor (cdr ,cursor))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2660 ;; Just using ,bound as a temporary |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2661 ;; variable here, to initialise ,save: |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2662 (nreverse ,bound) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2663 ;; Now, really initialise ,bound: |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2664 (setq ,cursor ,syms |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2665 ,bound nil |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2666 ,bound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2667 (progn (while (consp ,cursor) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2668 (setq ,bound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2669 (cons |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2670 (boundp (car ,cursor)) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2671 ,bound) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2672 ,cursor (cdr ,cursor))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2673 (nreverse ,bound))))))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2674 (bound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2675 (list (list bound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2676 (list (if (eq (car place) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2677 'symbol-value) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2678 'boundp 'fboundp) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2679 (nth 1 (nth 2 method)))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2680 (list save (list 'and bound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2681 (nth 2 method))))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2682 (t |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2683 (list (list save (nth 2 method))))) |
| 428 | 2684 (and temp (list (list temp value))) |
| 2685 lets) | |
| 2686 body (list | |
| 2687 (list 'unwind-protect | |
| 2688 (cons 'progn | |
| 2689 (if (cdr (car rev)) | |
| 2690 (cons (cl-setf-do-store (nth 1 method) | |
| 2691 (or temp value)) | |
| 2692 body) | |
| 2693 body)) | |
|
4742
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2694 (cond |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2695 (syms |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2696 `(while (consp ,syms) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2697 (if (car ,bound) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2698 (set (car ,syms) (car ,save)) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2699 (makunbound (car ,syms))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2700 (setq ,syms (cdr ,syms) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2701 ,bound (cdr ,bound) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2702 ,save (cdr ,save)))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2703 (bound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2704 (list 'if bound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2705 (cl-setf-do-store (nth 1 method) save) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2706 (list (if (eq (car place) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2707 'symbol-function) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2708 'fmakunbound |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2709 'makunbound) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2710 (nth 1 (nth 2 method))))) |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2711 (t |
|
4cf435fcebbc
Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4723
diff
changeset
|
2712 (cl-setf-do-store (nth 1 method) save))))) |
| 428 | 2713 rev (cdr rev)))) |
| 2714 (list* 'let* lets body)))) | |
| 2715 | |
| 2716 ;;;###autoload | |
| 2717 (defmacro letf* (bindings &rest body) | |
| 2718 "(letf* ((PLACE VALUE) ...) BODY...): temporarily bind to PLACEs. | |
| 2719 This is the analogue of `let*', but with generalized variables (in the | |
| 2720 sense of `setf') for the PLACEs. Each PLACE is set to the corresponding | |
| 2721 VALUE, then the BODY forms are executed. On exit, either normally or | |
| 2722 because of a `throw' or error, the PLACEs are set back to their original | |
| 2723 values. Note that this macro is *not* available in Common Lisp. | |
| 2724 As a special case, if `(PLACE)' is used instead of `(PLACE VALUE)', | |
| 2725 the PLACE is not modified before executing BODY." | |
| 2726 (if (null bindings) | |
| 2727 (cons 'progn body) | |
| 2728 (setq bindings (reverse bindings)) | |
| 2729 (while bindings | |
| 2153 | 2730 (setq body (list (list* 'letf (list (pop bindings)) body)))) |
| 428 | 2731 (car body))) |
| 2732 | |
| 2733 ;;;###autoload | |
| 2734 (defmacro callf (func place &rest args) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
2735 "Set PLACE to (FUNC PLACE ARGS...). |
| 428 | 2736 FUNC should be an unquoted function name. PLACE may be a symbol, |
| 2737 or any generalized variable allowed by `setf'." | |
| 2738 (let* ((method (cl-setf-do-modify place (cons 'list args))) | |
| 2739 (rargs (cons (nth 2 method) args))) | |
| 2740 (list 'let* (car method) | |
| 2741 (cl-setf-do-store (nth 1 method) | |
| 2742 (if (symbolp func) (cons func rargs) | |
| 2743 (list* 'funcall (list 'function func) | |
| 2744 rargs)))))) | |
| 2745 | |
| 2746 ;;;###autoload | |
| 2747 (defmacro callf2 (func arg1 place &rest args) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
2748 "Set PLACE to (FUNC ARG1 PLACE ARGS...). |
| 428 | 2749 Like `callf', but PLACE is the second argument of FUNC, not the first." |
| 2750 (if (and (cl-safe-expr-p arg1) (cl-simple-expr-p place) (symbolp func)) | |
| 2751 (list 'setf place (list* func arg1 place args)) | |
| 2752 (let* ((method (cl-setf-do-modify place (cons 'list args))) | |
| 2753 (temp (and (not (cl-const-expr-p arg1)) (gensym "--arg1--"))) | |
| 2754 (rargs (list* (or temp arg1) (nth 2 method) args))) | |
| 2755 (list 'let* (append (and temp (list (list temp arg1))) (car method)) | |
| 2756 (cl-setf-do-store (nth 1 method) | |
| 2757 (if (symbolp func) (cons func rargs) | |
| 2758 (list* 'funcall (list 'function func) | |
| 2759 rargs))))))) | |
| 2760 | |
| 2761 ;;;###autoload | |
| 2762 (defmacro define-modify-macro (name arglist func &optional doc) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
2763 "Define a `setf'-like modify macro. |
| 428 | 2764 If NAME is called, it combines its PLACE argument with the other arguments |
| 2765 from ARGLIST using FUNC: (define-modify-macro incf (&optional (n 1)) +)" | |
| 2766 (if (memq '&key arglist) (error "&key not allowed in define-modify-macro")) | |
| 2767 (let ((place (gensym "--place--"))) | |
| 2768 (list 'defmacro* name (cons place arglist) doc | |
| 2769 (list* (if (memq '&rest arglist) 'list* 'list) | |
| 2770 '(quote callf) (list 'quote func) place | |
| 2771 (cl-arglist-args arglist))))) | |
| 2772 | |
| 2773 | |
| 2774 ;;; Structures. | |
| 2775 | |
| 2776 ;;;###autoload | |
| 2777 (defmacro defstruct (struct &rest descs) | |
| 2778 "(defstruct (NAME OPTIONS...) (SLOT SLOT-OPTS...)...): define a struct type. | |
| 2779 This macro defines a new Lisp data type called NAME, which contains data | |
| 2780 stored in SLOTs. This defines a `make-NAME' constructor, a `copy-NAME' | |
| 2781 copier, a `NAME-p' predicate, and setf-able `NAME-SLOT' accessors." | |
| 2782 (let* ((name (if (consp struct) (car struct) struct)) | |
| 2783 (opts (cdr-safe struct)) | |
| 2784 (slots nil) | |
| 2785 (defaults nil) | |
| 2786 (conc-name (concat (symbol-name name) "-")) | |
| 2787 (constructor (intern (format "make-%s" name))) | |
| 2788 (constrs nil) | |
| 2789 (copier (intern (format "copy-%s" name))) | |
| 2790 (predicate (intern (format "%s-p" name))) | |
| 2791 (print-func nil) (print-auto nil) | |
| 2792 (safety (if (cl-compiling-file) cl-optimize-safety 3)) | |
| 2793 (include nil) | |
| 2794 (tag (intern (format "cl-struct-%s" name))) | |
| 2795 (tag-symbol (intern (format "cl-struct-%s-tags" name))) | |
| 2796 (include-descs nil) | |
| 2797 (side-eff nil) | |
| 2798 (type nil) | |
| 2799 (named nil) | |
| 2800 (forms nil) | |
| 2801 pred-form pred-check) | |
| 2802 (if (stringp (car descs)) | |
| 2153 | 2803 (push (list 'put (list 'quote name) '(quote structure-documentation) |
| 2804 (pop descs)) forms)) | |
| 428 | 2805 (setq descs (cons '(cl-tag-slot) |
| 2806 (mapcar #'(lambda (x) (if (consp x) x (list x))) | |
| 2807 descs))) | |
| 2808 (while opts | |
| 2809 (let ((opt (if (consp (car opts)) (caar opts) (car opts))) | |
| 2153 | 2810 (args (cdr-safe (pop opts)))) |
| 2811 (cond ((eq opt :conc-name) | |
| 428 | 2812 (if args |
| 2813 (setq conc-name (if (car args) | |
| 2814 (symbol-name (car args)) "")))) | |
| 2153 | 2815 ((eq opt :constructor) |
| 428 | 2816 (if (cdr args) |
| 2153 | 2817 (push args constrs) |
| 428 | 2818 (if args (setq constructor (car args))))) |
| 2153 | 2819 ((eq opt :copier) |
| 428 | 2820 (if args (setq copier (car args)))) |
| 2153 | 2821 ((eq opt :predicate) |
| 428 | 2822 (if args (setq predicate (car args)))) |
| 2153 | 2823 ((eq opt :include) |
| 428 | 2824 (setq include (car args) |
| 2825 include-descs (mapcar #'(lambda (x) | |
| 2826 (if (consp x) x (list x))) | |
| 2827 (cdr args)))) | |
| 2153 | 2828 ((eq opt :print-function) |
| 428 | 2829 (setq print-func (car args))) |
| 2153 | 2830 ((eq opt :type) |
| 428 | 2831 (setq type (car args))) |
| 2153 | 2832 ((eq opt :named) |
| 428 | 2833 (setq named t)) |
| 2153 | 2834 ((eq opt :initial-offset) |
| 428 | 2835 (setq descs (nconc (make-list (car args) '(cl-skip-slot)) |
| 2836 descs))) | |
| 2837 (t | |
| 2838 (error "Slot option %s unrecognized" opt))))) | |
| 2839 (if print-func | |
| 2840 (setq print-func (list 'progn | |
| 2841 (list 'funcall (list 'function print-func) | |
| 2842 'cl-x 'cl-s 'cl-n) t)) | |
| 2843 (or type (and include (not (get include 'cl-struct-print))) | |
| 2844 (setq print-auto t | |
| 2845 print-func (and (or (not (or include type)) (null print-func)) | |
| 2846 (list 'progn | |
| 2847 (list 'princ (format "#S(%s" name) | |
| 2848 'cl-s)))))) | |
| 2849 (if include | |
| 2850 (let ((inc-type (get include 'cl-struct-type)) | |
| 2851 (old-descs (get include 'cl-struct-slots))) | |
| 2852 (or inc-type (error "%s is not a struct name" include)) | |
| 2853 (and type (not (eq (car inc-type) type)) | |
| 2854 (error ":type disagrees with :include for %s" name)) | |
| 2855 (while include-descs | |
| 2856 (setcar (memq (or (assq (caar include-descs) old-descs) | |
| 2857 (error "No slot %s in included struct %s" | |
| 2858 (caar include-descs) include)) | |
| 2859 old-descs) | |
| 2153 | 2860 (pop include-descs))) |
| 428 | 2861 (setq descs (append old-descs (delq (assq 'cl-tag-slot descs) descs)) |
| 2862 type (car inc-type) | |
| 2863 named (assq 'cl-tag-slot descs)) | |
| 2864 (if (cadr inc-type) (setq tag name named t)) | |
| 2865 (let ((incl include)) | |
| 2866 (while incl | |
| 2153 | 2867 (push (list 'pushnew (list 'quote tag) |
| 428 | 2868 (intern (format "cl-struct-%s-tags" incl))) |
| 2869 forms) | |
| 2870 (setq incl (get incl 'cl-struct-include))))) | |
| 2871 (if type | |
| 2872 (progn | |
| 2873 (or (memq type '(vector list)) | |
| 2874 (error "Illegal :type specifier: %s" type)) | |
| 2875 (if named (setq tag name))) | |
| 2876 (setq type 'vector named 'true))) | |
| 2877 (or named (setq descs (delq (assq 'cl-tag-slot descs) descs))) | |
| 2153 | 2878 (push (list 'defvar tag-symbol) forms) |
| 428 | 2879 (setq pred-form (and named |
| 2880 (let ((pos (- (length descs) | |
| 2881 (length (memq (assq 'cl-tag-slot descs) | |
| 2882 descs))))) | |
| 2883 (if (eq type 'vector) | |
| 2884 (list 'and '(vectorp cl-x) | |
| 2885 (list '>= '(length cl-x) (length descs)) | |
| 2886 (list 'memq (list 'aref 'cl-x pos) | |
| 2887 tag-symbol)) | |
| 2888 (if (= pos 0) | |
| 2889 (list 'memq '(car-safe cl-x) tag-symbol) | |
| 2890 (list 'and '(consp cl-x) | |
| 2891 (list 'memq (list 'nth pos 'cl-x) | |
| 2892 tag-symbol)))))) | |
| 2893 pred-check (and pred-form (> safety 0) | |
| 2894 (if (and (eq (caadr pred-form) 'vectorp) | |
| 2895 (= safety 1)) | |
| 2896 (cons 'and (cdddr pred-form)) pred-form))) | |
| 2897 (let ((pos 0) (descp descs)) | |
| 2898 (while descp | |
| 2153 | 2899 (let* ((desc (pop descp)) |
| 428 | 2900 (slot (car desc))) |
| 2901 (if (memq slot '(cl-tag-slot cl-skip-slot)) | |
| 2902 (progn | |
| 2153 | 2903 (push nil slots) |
| 2904 (push (and (eq slot 'cl-tag-slot) (list 'quote tag)) | |
| 428 | 2905 defaults)) |
| 2906 (if (assq slot descp) | |
| 2907 (error "Duplicate slots named %s in %s" slot name)) | |
| 2908 (let ((accessor (intern (format "%s%s" conc-name slot)))) | |
| 2153 | 2909 (push slot slots) |
| 2910 (push (nth 1 desc) defaults) | |
| 2911 (push (list* | |
| 428 | 2912 'defsubst* accessor '(cl-x) |
| 2913 (append | |
| 2914 (and pred-check | |
| 2915 (list (list 'or pred-check | |
| 2916 (list 'error | |
| 2917 (format "%s accessing a non-%s" | |
| 2918 accessor name) | |
| 2919 'cl-x)))) | |
| 2920 (list (if (eq type 'vector) (list 'aref 'cl-x pos) | |
| 2921 (if (= pos 0) '(car cl-x) | |
| 2922 (list 'nth pos 'cl-x)))))) forms) | |
| 2153 | 2923 (push (cons accessor t) side-eff) |
| 2924 (push (list 'define-setf-method accessor '(cl-x) | |
| 2925 (if (cadr (memq :read-only (cddr desc))) | |
| 428 | 2926 (list 'error (format "%s is a read-only slot" |
| 2927 accessor)) | |
| 2928 (list 'cl-struct-setf-expander 'cl-x | |
| 2929 (list 'quote name) (list 'quote accessor) | |
| 2930 (and pred-check (list 'quote pred-check)) | |
| 2931 pos))) | |
| 2932 forms) | |
| 2933 (if print-auto | |
| 2934 (nconc print-func | |
| 2935 (list (list 'princ (format " %s" slot) 'cl-s) | |
| 2936 (list 'prin1 (list accessor 'cl-x) 'cl-s))))))) | |
| 2937 (setq pos (1+ pos)))) | |
| 2938 (setq slots (nreverse slots) | |
| 2939 defaults (nreverse defaults)) | |
| 2940 (and predicate pred-form | |
| 2153 | 2941 (progn (push (list 'defsubst* predicate '(cl-x) |
| 428 | 2942 (if (eq (car pred-form) 'and) |
| 2943 (append pred-form '(t)) | |
| 2944 (list 'and pred-form t))) forms) | |
| 2153 | 2945 (push (cons predicate 'error-free) side-eff))) |
| 428 | 2946 (and copier |
| 2153 | 2947 (progn (push (list 'defun copier '(x) '(copy-sequence x)) forms) |
| 2948 (push (cons copier t) side-eff))) | |
| 428 | 2949 (if constructor |
| 2153 | 2950 (push (list constructor |
| 428 | 2951 (cons '&key (delq nil (copy-sequence slots)))) |
| 2952 constrs)) | |
| 2953 (while constrs | |
| 2954 (let* ((name (caar constrs)) | |
| 2153 | 2955 (args (cadr (pop constrs))) |
| 428 | 2956 (anames (cl-arglist-args args)) |
| 2957 (make (mapcar* #'(lambda (s d) (if (memq s anames) s d)) | |
| 2958 slots defaults))) | |
| 2153 | 2959 (push (list 'defsubst* name |
| 428 | 2960 (list* '&cl-defs (list 'quote (cons nil descs)) args) |
| 2961 (cons type make)) forms) | |
| 2962 (if (cl-safe-expr-p (cons 'progn (mapcar 'second descs))) | |
| 2153 | 2963 (push (cons name t) side-eff)))) |
| 428 | 2964 (if print-auto (nconc print-func (list '(princ ")" cl-s) t))) |
| 2965 (if print-func | |
| 2153 | 2966 (push (list 'push |
| 428 | 2967 (list 'function |
| 2968 (list 'lambda '(cl-x cl-s cl-n) | |
| 2969 (list 'and pred-form print-func))) | |
| 2970 'custom-print-functions) forms)) | |
| 2153 | 2971 (push (list 'setq tag-symbol (list 'list (list 'quote tag))) forms) |
| 2972 (push (list* 'eval-when '(compile load eval) | |
| 428 | 2973 (list 'put (list 'quote name) '(quote cl-struct-slots) |
| 2974 (list 'quote descs)) | |
| 2975 (list 'put (list 'quote name) '(quote cl-struct-type) | |
| 2976 (list 'quote (list type (eq named t)))) | |
| 2977 (list 'put (list 'quote name) '(quote cl-struct-include) | |
| 2978 (list 'quote include)) | |
| 2979 (list 'put (list 'quote name) '(quote cl-struct-print) | |
| 2980 print-auto) | |
| 2981 (mapcar #'(lambda (x) | |
| 2982 (list 'put (list 'quote (car x)) | |
| 2983 '(quote side-effect-free) | |
| 2984 (list 'quote (cdr x)))) | |
| 2985 side-eff)) | |
| 2986 forms) | |
| 2987 (cons 'progn (nreverse (cons (list 'quote name) forms))))) | |
| 2988 | |
| 2989 ;;;###autoload | |
| 2990 (defun cl-struct-setf-expander (x name accessor pred-form pos) | |
| 2991 (let* ((temp (gensym "--x--")) (store (gensym "--store--"))) | |
| 2992 (list (list temp) (list x) (list store) | |
| 2993 (append '(progn) | |
| 2994 (and pred-form | |
| 2995 (list (list 'or (subst temp 'cl-x pred-form) | |
| 2996 (list 'error | |
| 2997 (format | |
| 2998 "%s storing a non-%s" accessor name) | |
| 2999 temp)))) | |
| 3000 (list (if (eq (car (get name 'cl-struct-type)) 'vector) | |
| 3001 (list 'aset temp pos store) | |
| 3002 (list 'setcar | |
| 3003 (if (<= pos 5) | |
| 3004 (let ((xx temp)) | |
| 3005 (while (>= (setq pos (1- pos)) 0) | |
| 3006 (setq xx (list 'cdr xx))) | |
| 3007 xx) | |
| 3008 (list 'nthcdr pos temp)) | |
| 3009 store)))) | |
| 3010 (list accessor temp)))) | |
| 3011 | |
| 3012 | |
| 3013 ;;; Types and assertions. | |
| 3014 | |
| 3015 ;;;###autoload | |
| 2153 | 3016 (defmacro deftype (name arglist &rest body) |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
3017 "Define NAME as a new data type. |
| 428 | 3018 The type name can then be used in `typecase', `check-type', etc." |
| 3019 (list 'eval-when '(compile load eval) | |
| 3020 (cl-transform-function-property | |
| 2153 | 3021 name 'cl-deftype-handler (cons (list* '&cl-defs ''('*) arglist) body)))) |
| 428 | 3022 |
| 3023 (defun cl-make-type-test (val type) | |
| 3024 (if (symbolp type) | |
| 3025 (cond ((get type 'cl-deftype-handler) | |
| 3026 (cl-make-type-test val (funcall (get type 'cl-deftype-handler)))) | |
| 3027 ((memq type '(nil t)) type) | |
| 2153 | 3028 ((eq type 'null) `(null ,val)) |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3029 ((eq type 'float) `(floatp ,val)) |
| 2153 | 3030 ((eq type 'real) `(numberp ,val)) |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3031 ((eq type 'fixnum) `(fixnump ,val)) |
| 2153 | 3032 ;; XEmacs change: we do not have char-valid-p |
| 3033 ((memq type '(character string-char)) `(characterp ,val)) | |
| 428 | 3034 (t |
| 3035 (let* ((name (symbol-name type)) | |
| 3036 (namep (intern (concat name "p")))) | |
| 3037 (if (fboundp namep) (list namep val) | |
| 3038 (list (intern (concat name "-p")) val))))) | |
| 3039 (cond ((get (car type) 'cl-deftype-handler) | |
| 3040 (cl-make-type-test val (apply (get (car type) 'cl-deftype-handler) | |
| 3041 (cdr type)))) | |
| 3042 ((memq (car-safe type) '(integer float real number)) | |
| 3043 (delq t (list 'and (cl-make-type-test val (car type)) | |
| 3044 (if (memq (cadr type) '(* nil)) t | |
| 3045 (if (consp (cadr type)) (list '> val (caadr type)) | |
| 3046 (list '>= val (cadr type)))) | |
| 3047 (if (memq (caddr type) '(* nil)) t | |
| 3048 (if (consp (caddr type)) (list '< val (caaddr type)) | |
| 3049 (list '<= val (caddr type))))))) | |
| 3050 ((memq (car-safe type) '(and or not)) | |
| 3051 (cons (car type) | |
| 3052 (mapcar #'(lambda (x) (cl-make-type-test val x)) | |
| 3053 (cdr type)))) | |
| 3054 ((memq (car-safe type) '(member member*)) | |
| 3055 (list 'and (list 'member* val (list 'quote (cdr type))) t)) | |
| 3056 ((eq (car-safe type) 'satisfies) (list (cadr type) val)) | |
| 3057 (t (error "Bad type spec: %s" type))))) | |
| 3058 | |
| 3059 ;;;###autoload | |
| 444 | 3060 (defun typep (object type) ; See compiler macro below. |
| 428 | 3061 "Check that OBJECT is of type TYPE. |
| 3062 TYPE is a Common Lisp-style type specifier." | |
| 444 | 3063 (eval (cl-make-type-test 'object type))) |
| 428 | 3064 |
| 3065 ;;;###autoload | |
| 446 | 3066 (defmacro check-type (place type &optional string) |
| 3067 "Verify that PLACE is of type TYPE; signal a continuable error if not. | |
| 428 | 3068 STRING is an optional description of the desired type." |
| 2153 | 3069 (and (or (not (cl-compiling-file)) |
| 3070 (< cl-optimize-speed 3) (= cl-optimize-safety 3)) | |
| 3071 (let* ((temp (if (cl-simple-expr-p place 3) place (gensym))) | |
| 3072 (test (cl-make-type-test temp type)) | |
| 3073 (signal-error `(signal 'wrong-type-argument | |
| 3074 ,(list 'list (or string (list 'quote type)) | |
| 3075 temp (list 'quote place)))) | |
| 3076 (body | |
| 3077 (condition-case nil | |
| 3078 `(while (not ,test) | |
| 3079 ,(macroexpand `(setf ,place ,signal-error))) | |
| 3080 (error | |
| 3081 `(if ,test (progn ,signal-error nil)))))) | |
| 3082 (if (eq temp place) `(progn ,body nil) | |
| 3083 `(let ((,temp ,place)) ,body nil))))) | |
| 428 | 3084 |
| 3085 ;;;###autoload | |
| 3086 (defmacro assert (form &optional show-args string &rest args) | |
| 3087 "Verify that FORM returns non-nil; signal an error if not. | |
| 3088 Second arg SHOW-ARGS means to include arguments of FORM in message. | |
| 3089 Other args STRING and ARGS... are arguments to be passed to `error'. | |
| 3090 They are not evaluated unless the assertion fails. If STRING is | |
| 3091 omitted, a default message listing FORM itself is used." | |
| 3092 (and (or (not (cl-compiling-file)) | |
| 3093 (< cl-optimize-speed 3) (= cl-optimize-safety 3)) | |
| 3094 (let ((sargs (and show-args (delq nil (mapcar | |
| 3095 #'(lambda (x) | |
| 3096 (and (not (cl-const-expr-p x)) | |
| 3097 x)) | |
| 3098 (cdr form)))))) | |
| 3099 (list 'progn | |
| 3100 (list 'or form | |
| 3101 (if string | |
| 3102 (list* 'error string (append sargs args)) | |
| 3103 (list 'signal '(quote cl-assertion-failed) | |
| 3104 (list* 'list (list 'quote form) sargs)))) | |
| 3105 nil)))) | |
| 3106 | |
| 3107 ;;;###autoload | |
| 3108 (defmacro ignore-errors (&rest body) | |
| 2153 | 3109 "Execute BODY; if an error occurs, return nil. |
| 3110 Otherwise, return result of last form in BODY." | |
| 428 | 3111 `(condition-case nil (progn ,@body) (error nil))) |
| 3112 | |
| 2153 | 3113 ;; XEmacs addition |
| 428 | 3114 ;;;###autoload |
| 3115 (defmacro ignore-file-errors (&rest body) | |
| 3116 "Execute FORMS; if an error of type `file-error' occurs, return nil. | |
| 3117 Otherwise, return result of last FORM." | |
| 3118 `(condition-case nil (progn ,@body) (file-error nil))) | |
| 3119 | |
| 3120 | |
| 3121 ;;; Compiler macros. | |
| 3122 | |
| 3123 ;;;###autoload | |
| 3124 (defmacro define-compiler-macro (func args &rest body) | |
|
4695
fee33ab25966
Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4694
diff
changeset
|
3125 "Define a compiler-only macro. |
| 428 | 3126 This is like `defmacro', but macro expansion occurs only if the call to |
| 3127 FUNC is compiled (i.e., not interpreted). Compiler macros should be used | |
| 3128 for optimizing the way calls to FUNC are compiled; the form returned by | |
| 3129 BODY should do the same thing as a call to the normal function called | |
| 3130 FUNC, though possibly more efficiently. Note that, like regular macros, | |
| 3131 compiler macros are expanded repeatedly until no further expansions are | |
| 3132 possible. Unlike regular macros, BODY can decide to \"punt\" and leave the | |
| 3133 original function call alone by declaring an initial `&whole foo' parameter | |
| 3134 and then returning foo." | |
| 3135 (let ((p (if (listp args) args (list '&rest args))) (res nil)) | |
| 2153 | 3136 (while (consp p) (push (pop p) res)) |
| 3137 (setq args (nconc (nreverse res) (and p (list '&rest p))))) | |
| 428 | 3138 (list 'eval-when '(compile load eval) |
| 3139 (cl-transform-function-property | |
| 3140 func 'cl-compiler-macro | |
| 3141 (cons (if (memq '&whole args) (delq '&whole args) | |
| 3142 (cons '--cl-whole-arg-- args)) body)) | |
| 3143 (list 'or (list 'get (list 'quote func) '(quote byte-compile)) | |
| 3144 (list 'put (list 'quote func) '(quote byte-compile) | |
| 3145 '(quote cl-byte-compile-compiler-macro))))) | |
| 3146 | |
| 3147 ;;;###autoload | |
| 3148 (defun compiler-macroexpand (form) | |
| 3149 (while | |
| 3150 (let ((func (car-safe form)) (handler nil)) | |
| 3151 (while (and (symbolp func) | |
| 3152 (not (setq handler (get func 'cl-compiler-macro))) | |
| 3153 (fboundp func) | |
| 3154 (or (not (eq (car-safe (symbol-function func)) 'autoload)) | |
| 3155 (load (nth 1 (symbol-function func))))) | |
| 3156 (setq func (symbol-function func))) | |
| 3157 (and handler | |
| 3158 (not (eq form (setq form (apply handler form (cdr form)))))))) | |
| 3159 form) | |
| 3160 | |
| 3161 (defun cl-byte-compile-compiler-macro (form) | |
| 3162 (if (eq form (setq form (compiler-macroexpand form))) | |
| 3163 (byte-compile-normal-call form) | |
| 3164 (byte-compile-form form))) | |
| 3165 | |
| 3166 (defmacro defsubst* (name args &rest body) | |
| 3167 "(defsubst* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a function. | |
| 3168 Like `defun', except the function is automatically declared `inline', | |
| 3169 ARGLIST allows full Common Lisp conventions, and BODY is implicitly | |
| 3170 surrounded by (block NAME ...)." | |
| 3171 (let* ((argns (cl-arglist-args args)) (p argns) | |
| 3172 (pbody (cons 'progn body)) | |
| 3173 (unsafe (not (cl-safe-expr-p pbody)))) | |
| 2153 | 3174 (while (and p (eq (cl-expr-contains args (car p)) 1)) (pop p)) |
| 428 | 3175 (list 'progn |
| 3176 (if p nil ; give up if defaults refer to earlier args | |
| 3177 (list 'define-compiler-macro name | |
| 2153 | 3178 (if (memq '&key args) |
| 3179 (list* '&whole 'cl-whole '&cl-quote args) | |
| 3180 (cons '&cl-quote args)) | |
| 428 | 3181 (list* 'cl-defsubst-expand (list 'quote argns) |
| 3182 (list 'quote (list* 'block name body)) | |
| 3183 (not (or unsafe (cl-expr-access-order pbody argns))) | |
| 3184 (and (memq '&key args) 'cl-whole) unsafe argns))) | |
| 3185 (list* 'defun* name args body)))) | |
| 3186 | |
| 3187 (defun cl-defsubst-expand (argns body simple whole unsafe &rest argvs) | |
| 3188 (if (and whole (not (cl-safe-expr-p (cons 'progn argvs)))) whole | |
| 3189 (if (cl-simple-exprs-p argvs) (setq simple t)) | |
| 3190 (let ((lets (delq nil | |
| 3191 (mapcar* #'(lambda (argn argv) | |
| 3192 (if (or simple (cl-const-expr-p argv)) | |
| 3193 (progn (setq body (subst argv argn body)) | |
| 3194 (and unsafe (list argn argv))) | |
| 3195 (list argn argv))) | |
| 3196 argns argvs)))) | |
| 3197 (if lets (list 'let lets body) body)))) | |
| 3198 | |
| 3199 | |
| 3200 ;;; Compile-time optimizations for some functions defined in this package. | |
| 3201 ;;; Note that cl.el arranges to force cl-macs to be loaded at compile-time, | |
| 3202 ;;; mainly to make sure these macros will be present. | |
| 3203 | |
| 3204 (put 'eql 'byte-compile nil) | |
| 3205 (define-compiler-macro eql (&whole form a b) | |
| 3206 (cond ((eq (cl-const-expr-p a) t) | |
| 3207 (let ((val (cl-const-expr-val a))) | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3208 (if (and (numberp val) (not (fixnump val))) |
| 428 | 3209 (list 'equal a b) |
| 3210 (list 'eq a b)))) | |
| 3211 ((eq (cl-const-expr-p b) t) | |
| 3212 (let ((val (cl-const-expr-val b))) | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3213 (if (and (numberp val) (not (fixnump val))) |
| 428 | 3214 (list 'equal a b) |
| 3215 (list 'eq a b)))) | |
| 3216 ((cl-simple-expr-p a 5) | |
| 3217 (list 'if (list 'numberp a) | |
| 3218 (list 'equal a b) | |
| 3219 (list 'eq a b))) | |
| 3220 ((and (cl-safe-expr-p a) | |
| 3221 (cl-simple-expr-p b 5)) | |
| 3222 (list 'if (list 'numberp b) | |
| 3223 (list 'equal a b) | |
| 3224 (list 'eq a b))) | |
| 3225 (t form))) | |
| 3226 | |
| 3227 (define-compiler-macro member* (&whole form a list &rest keys) | |
| 2153 | 3228 (let ((test (and (= (length keys) 2) (eq (car keys) :test) |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3229 (cl-const-expr-val (nth 1 keys)))) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3230 a-val) |
| 428 | 3231 (cond ((eq test 'eq) (list 'memq a list)) |
| 3232 ((eq test 'equal) (list 'member a list)) | |
| 3233 ((or (null keys) (eq test 'eql)) | |
| 3234 (if (eq (cl-const-expr-p a) t) | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3235 (list (if (and (numberp (setq a-val (cl-const-expr-val a))) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3236 (not (fixnump a-val))) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3237 'member |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3238 'memq) |
| 428 | 3239 a list) |
| 3240 (if (eq (cl-const-expr-p list) t) | |
| 3241 (let ((p (cl-const-expr-val list)) (mb nil) (mq nil)) | |
| 3242 (if (not (cdr p)) | |
| 3243 (and p (list 'eql a (list 'quote (car p)))) | |
| 3244 (while p | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3245 (if (and (numberp (car p)) (not (fixnump (car p)))) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3246 (setq mb t) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3247 (or (fixnump (car p)) (symbolp (car p)) (setq mq t))) |
| 428 | 3248 (setq p (cdr p))) |
| 3249 (if (not mb) (list 'memq a list) | |
| 3250 (if (not mq) (list 'member a list) form)))) | |
| 3251 form))) | |
| 3252 (t form)))) | |
| 3253 | |
| 3254 (define-compiler-macro assoc* (&whole form a list &rest keys) | |
| 2153 | 3255 (let ((test (and (= (length keys) 2) (eq (car keys) :test) |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3256 (cl-const-expr-val (nth 1 keys)))) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3257 a-val) |
| 428 | 3258 (cond ((eq test 'eq) (list 'assq a list)) |
| 3259 ((eq test 'equal) (list 'assoc a list)) | |
| 3260 ((and (eq (cl-const-expr-p a) t) (or (null keys) (eq test 'eql))) | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3261 (if (and (numberp (setq a-val (cl-const-expr-val a))) |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3262 (not (fixnump a-val))) |
| 428 | 3263 (list 'assoc a list) (list 'assq a list))) |
| 3264 (t form)))) | |
| 3265 | |
| 3266 (define-compiler-macro adjoin (&whole form a list &rest keys) | |
| 3267 (if (and (cl-simple-expr-p a) (cl-simple-expr-p list) | |
| 2153 | 3268 (not (memq :key keys))) |
| 428 | 3269 (list 'if (list* 'member* a list keys) list (list 'cons a list)) |
| 3270 form)) | |
| 3271 | |
| 3272 (define-compiler-macro list* (arg &rest others) | |
| 3273 (let* ((args (reverse (cons arg others))) | |
| 3274 (form (car args))) | |
| 3275 (while (setq args (cdr args)) | |
| 3276 (setq form (list 'cons (car args) form))) | |
| 3277 form)) | |
| 3278 | |
| 2153 | 3279 ;; XEmacs change: our builtin get takes the default argument |
| 440 | 3280 (define-compiler-macro get* (sym prop &optional default) |
| 3281 (list 'get sym prop default)) | |
| 428 | 3282 |
| 442 | 3283 (define-compiler-macro getf (sym prop &optional default) |
| 3284 (list 'plist-get sym prop default)) | |
| 3285 | |
| 428 | 3286 (define-compiler-macro typep (&whole form val type) |
| 3287 (if (cl-const-expr-p type) | |
| 3288 (let ((res (cl-make-type-test val (cl-const-expr-val type)))) | |
| 3289 (if (or (memq (cl-expr-contains res val) '(nil 1)) | |
| 3290 (cl-simple-expr-p val)) res | |
| 3291 (let ((temp (gensym))) | |
| 3292 (list 'let (list (list temp val)) (subst temp val res))))) | |
| 3293 form)) | |
| 3294 | |
|
4607
517f6887fbc0
Remove duplicate functions, chiefly #'delete-duplicates reimplementations.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2297
diff
changeset
|
3295 ;; XEmacs; inline delete-duplicates if it's called with a literal |
|
517f6887fbc0
Remove duplicate functions, chiefly #'delete-duplicates reimplementations.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2297
diff
changeset
|
3296 ;; #'equal or #'eq and no other keywords, we want the speed in |
|
517f6887fbc0
Remove duplicate functions, chiefly #'delete-duplicates reimplementations.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2297
diff
changeset
|
3297 ;; font-lock.el. |
|
517f6887fbc0
Remove duplicate functions, chiefly #'delete-duplicates reimplementations.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2297
diff
changeset
|
3298 (define-compiler-macro delete-duplicates (&whole form cl-seq &rest cl-keys) |
|
4707
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3299 (let ((listp-check |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3300 (if (memq (car-safe cl-seq) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3301 ;; No need to check for a list at runtime with these. We |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3302 ;; could expand the list, but these are all the functions |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3303 ;; in the relevant context at the moment. |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3304 '(nreverse append nconc mapcan mapcar)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3305 t |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3306 '(listp begin)))) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3307 (cond ((and (= 4 (length form)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3308 (eq :test (third form)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3309 (or (equal '(quote eq) (fourth form)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3310 (equal '(function eq) (fourth form)))) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3311 `(let* ((begin ,cl-seq) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3312 (cl-seq begin)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3313 (if ,listp-check |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3314 (progn |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3315 (while cl-seq |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3316 (setq cl-seq (setcdr cl-seq (delq (car cl-seq) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3317 (cdr cl-seq))))) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3318 begin) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3319 ;; Call cl-delete-duplicates explicitly, to avoid the form |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3320 ;; getting compiler-macroexpanded again: |
|
4714
84f870bbd17b
Fix another bug in the delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4707
diff
changeset
|
3321 (cl-delete-duplicates begin ',cl-keys nil)))) |
|
4707
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3322 ((and (= 4 (length form)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3323 (eq :test (third form)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3324 (or (equal '(quote equal) (fourth form)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3325 (equal '(function equal) (fourth form)))) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3326 `(let* ((begin ,cl-seq) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3327 (cl-seq begin)) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3328 (if ,listp-check |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3329 (progn |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3330 (while cl-seq |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3331 (setq cl-seq (setcdr cl-seq (delete (car cl-seq) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3332 (cdr cl-seq))))) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3333 begin) |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3334 ;; Call cl-delete-duplicates explicitly, to avoid the form |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3335 ;; getting compiler-macroexpanded again: |
|
4714
84f870bbd17b
Fix another bug in the delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4707
diff
changeset
|
3336 (cl-delete-duplicates begin ',cl-keys nil)))) |
|
4707
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3337 (t |
|
5bb0735f56e0
Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4702
diff
changeset
|
3338 form)))) |
| 428 | 3339 |
|
4716
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4714
diff
changeset
|
3340 ;; XEmacs change, the GNU mapc doesn't accept the Common Lisp args, so this |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4714
diff
changeset
|
3341 ;; change isn't helpful. |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4714
diff
changeset
|
3342 (define-compiler-macro mapc (&whole form cl-func cl-seq &rest cl-rest) |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4714
diff
changeset
|
3343 (if cl-rest |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4714
diff
changeset
|
3344 form |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4714
diff
changeset
|
3345 (cons 'mapc-internal (cdr form)))) |
|
dca5bb2adff1
Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents:
4714
diff
changeset
|
3346 |
|
4719
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3347 (define-compiler-macro mapcar* (&whole form cl-func cl-x &rest cl-rest) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3348 (if cl-rest |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3349 form |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3350 (cons 'mapcar (cdr form)))) |
|
bd51ab22afa8
Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4716
diff
changeset
|
3351 |
|
4723
ebca981a0012
If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3352 ;; XEmacs; it's perfectly reasonable, and often much clearer to those |
|
ebca981a0012
If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3353 ;; reading the code, to call regexp-quote on a constant string, which is |
|
ebca981a0012
If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3354 ;; something we can optimise here easily. |
|
ebca981a0012
If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3355 (define-compiler-macro regexp-quote (&whole form string) |
|
ebca981a0012
If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3356 (if (stringp string) |
|
ebca981a0012
If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3357 (regexp-quote string) |
|
ebca981a0012
If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3358 form)) |
|
ebca981a0012
If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4719
diff
changeset
|
3359 |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3360 ;; NOTE: `equalp' is now a primitive, although as of yet it still doesn't |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3361 ;; have a byte-compiler opcode for it. The compiler-macro for `equalp' used |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3362 ;; to try and remove as much as possible of the logic of the Lisp `equalp' as |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3363 ;; possible whenever one of the arguments is a constant, boiling things down |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3364 ;; to a few if-statements and some calls to various no-longer-defined |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3365 ;; helper functions. Besides the fact that the helper functions aren't |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3366 ;; defined, there's little point in doing any of that expansion, since it will |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3367 ;; end up executing in Lisp what would otherwise be done in C by a direct |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3368 ;; call to `equalp'. The only exception is when the reduction is quite |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3369 ;; simple and is to functions that do have op-codes; that may gain something. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3370 ;; However, if `equalp' becomes an opcode itself, consider removing everything |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3371 ;; here except maybe when the call can directly be reduced to `equal' or `eq'. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3372 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3373 ;; --ben |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3374 |
|
4792
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3375 (define-compiler-macro equalp (&whole form x y) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3376 "Expand calls to `equalp' where X or Y is a constant expression. |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3377 |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3378 Much of the processing that `equalp' does is dependent on the types of both |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3379 of its arguments, and with type information for one of them, we can |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3380 eliminate much of the body of the function at compile time. |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3381 |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3382 Where both X and Y are constant expressions, `equalp' is evaluated at |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3383 compile time by byte-optimize.el--this compiler macro passes FORM through to |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3384 the byte optimizer in those cases." |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3385 ;; Cases where both arguments are constant are handled in |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3386 ;; byte-optimize.el, we only need to handle those cases where one is |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3387 ;; constant here. |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3388 (let* ((equalp-sym (eval-when-compile (gensym))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3389 (let-form '(progn)) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3390 (original-y y) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3391 equalp-temp checked) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3392 (macrolet |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3393 ((unordered-check (check) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3394 `(prog1 |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3395 (setq checked |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3396 (or ,check |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3397 (prog1 ,(sublis '((x . y) (y . x)) check :test #'eq) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3398 (setq equalp-temp x x y y equalp-temp)))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3399 (when checked |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3400 (unless (symbolp y) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3401 (setq let-form `(let ((,equalp-sym ,y))) y equalp-sym)))))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3402 ;; In the bodies of the below clauses, x is always a constant expression |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3403 ;; of the type we're interested in, and y is always a symbol that refers |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3404 ;; to the result non-constant side of the comparison. |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3405 (cond ((unordered-check (and (arrayp x) (not (cl-const-expr-p y)))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3406 ;; Strings and other arrays. A vector containing the same |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3407 ;; character elements as a given string is equalp to that string; |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3408 ;; a bit-vector can only be equalp to a string if both are |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3409 ;; zero-length. |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3410 (cond |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3411 ((member x '("" #* [])) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3412 ;; No need to protect against multiple evaluation here: |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3413 `(and (member ,original-y '("" #* [])) t)) |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3414 (t form))) |
|
4792
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3415 ((unordered-check (and (characterp x) (not (cl-const-expr-p y)))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3416 `(,@let-form |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3417 (or (eq ,x ,y) |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3418 ;; eq has a bytecode, char-equal doesn't. |
|
4792
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3419 (and (characterp ,y) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3420 (eq (downcase ,x) (downcase ,y)))))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3421 ((unordered-check (and (numberp x) (not (cl-const-expr-p y)))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3422 `(,@let-form |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3423 (and (numberp ,y) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3424 (= ,x ,y)))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3425 ((unordered-check (and (hash-table-p x) (not (cl-const-expr-p y)))) |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3426 form) |
|
4792
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3427 ((unordered-check |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3428 ;; Symbols; eq. |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3429 (and (not (cl-const-expr-p y)) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3430 (or (memq x '(nil t)) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3431 (and (eq (car-safe x) 'quote) (symbolp (second x)))))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3432 (cons 'eq (cdr form))) |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3433 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3434 ;; This clause is wrong -- e.g. when comparing a constant char-table |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3435 ;; against a non-constant expression that evaluates to a char-table, |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3436 ;; or some for range tables or certain other types, `equalp' is |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3437 ;; not the same as `equal'. We could insert the known list of |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3438 ;; types with special `equalp' property, but it's fragile and may |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3439 ;; not be much of an optimization, esp. since these types don't |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3440 ;; occur that often are often big. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3441 ;;((unordered-check |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3442 ;; ;; Compare conses at runtime, there's no real upside to |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3443 ;; ;; unrolling the function -> they fall through to the next |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3444 ;; ;; clause in this function. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3445 ;; (and (cl-const-expr-p x) (not (consp x)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3446 ;; (not (cl-const-expr-p y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3447 ;; ;; All other types; use equal. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3448 ;; (cons 'equal (cdr form))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3449 |
|
4792
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3450 ;; Neither side is a constant expression, do all our evaluation at |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3451 ;; runtime (or both are, and equalp will be called from |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3452 ;; byte-optimize.el). |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3453 (t form))))) |
|
95b04754ea8c
Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
3454 |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3455 ;;(define-compiler-macro equalp (&whole form x y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3456 ;; "Expand calls to `equalp' where X or Y is a constant expression. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3457 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3458 ;;Much of the processing that `equalp' does is dependent on the types of both |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3459 ;;of its arguments, and with type information for one of them, we can |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3460 ;;eliminate much of the body of the function at compile time. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3461 ;; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3462 ;;Where both X and Y are constant expressions, `equalp' is evaluated at |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3463 ;;compile time by byte-optimize.el--this compiler macro passes FORM through to |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3464 ;;the byte optimizer in those cases." |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3465 ;; ;; Cases where both arguments are constant are handled in |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3466 ;; ;; byte-optimize.el, we only need to handle those cases where one is |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3467 ;; ;; constant here. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3468 ;; (let* ((equalp-sym (eval-when-compile (gensym))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3469 ;; (let-form '(progn)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3470 ;; (check-bit-vector t) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3471 ;; (check-string t) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3472 ;; (original-y y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3473 ;; equalp-temp checked) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3474 ;; (macrolet |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3475 ;; ((unordered-check (check) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3476 ;; `(prog1 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3477 ;; (setq checked |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3478 ;; (or ,check |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3479 ;; (prog1 ,(sublis '((x . y) (y . x)) check :test #'eq) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3480 ;; (setq equalp-temp x x y y equalp-temp)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3481 ;; (when checked |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3482 ;; (unless (symbolp y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3483 ;; (setq let-form `(let ((,equalp-sym ,y))) y equalp-sym)))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3484 ;; ;; In the bodies of the below clauses, x is always a constant expression |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3485 ;; ;; of the type we're interested in, and y is always a symbol that refers |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3486 ;; ;; to the result non-constant side of the comparison. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3487 ;; (cond ((unordered-check (and (arrayp x) (not (cl-const-expr-p y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3488 ;; ;; Strings and other arrays. A vector containing the same |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3489 ;; ;; character elements as a given string is equalp to that string; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3490 ;; ;; a bit-vector can only be equalp to a string if both are |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3491 ;; ;; zero-length. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3492 ;; (cond |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3493 ;; ((member x '("" #* [])) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3494 ;; ;; No need to protect against multiple evaluation here: |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3495 ;; `(and (member ,original-y '("" #* [])) t)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3496 ;; ((stringp x) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3497 ;; `(,@let-form |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3498 ;; (if (stringp ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3499 ;; (eq t (compare-strings ,x nil nil |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3500 ;; ,y nil nil t)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3501 ;; (if (vectorp ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3502 ;; (cl-string-vector-equalp ,x ,y))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3503 ;; ((bit-vector-p x) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3504 ;; `(,@let-form |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3505 ;; (if (bit-vector-p ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3506 ;; ;; No need to call equalp on each element here: |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3507 ;; (equal ,x ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3508 ;; (if (vectorp ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3509 ;; (cl-bit-vector-vector-equalp ,x ,y))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3510 ;; (t |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3511 ;; (loop |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3512 ;; for elt across x |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3513 ;; ;; We may not need to check the other argument if it's a |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3514 ;; ;; string or bit vector, depending on the contents of x: |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3515 ;; always (progn |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3516 ;; (unless (characterp elt) (setq check-string nil)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3517 ;; (unless (and (numberp elt) (or (= elt 0) (= elt 1))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3518 ;; (setq check-bit-vector nil)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3519 ;; (or check-string check-bit-vector))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3520 ;; `(,@let-form |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3521 ;; (cond |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3522 ;; ,@(if check-string |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3523 ;; `(((stringp ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3524 ;; (cl-string-vector-equalp ,y ,x)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3525 ;; ,@(if check-bit-vector |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3526 ;; `(((bit-vector-p ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3527 ;; (cl-bit-vector-vector-equalp ,y ,x)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3528 ;; ((vectorp ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3529 ;; (cl-vector-array-equalp ,x ,y))))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3530 ;; ((unordered-check (and (characterp x) (not (cl-const-expr-p y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3531 ;; `(,@let-form |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3532 ;; (or (eq ,x ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3533 ;; ;; eq has a bytecode, char-equal doesn't. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3534 ;; (and (characterp ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3535 ;; (eq (downcase ,x) (downcase ,y)))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3536 ;; ((unordered-check (and (numberp x) (not (cl-const-expr-p y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3537 ;; `(,@let-form |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3538 ;; (and (numberp ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3539 ;; (= ,x ,y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3540 ;; ((unordered-check (and (hash-table-p x) (not (cl-const-expr-p y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3541 ;; ;; Hash tables; follow the CL spec. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3542 ;; `(,@let-form |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3543 ;; (and (hash-table-p ,y) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3544 ;; (eq ',(hash-table-test x) (hash-table-test ,y)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3545 ;; (= ,(hash-table-count x) (hash-table-count ,y)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3546 ;; (cl-hash-table-contents-equalp ,x ,y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3547 ;; ((unordered-check |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3548 ;; ;; Symbols; eq. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3549 ;; (and (not (cl-const-expr-p y)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3550 ;; (or (memq x '(nil t)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3551 ;; (and (eq (car-safe x) 'quote) (symbolp (second x)))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3552 ;; (cons 'eq (cdr form))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3553 ;; ((unordered-check |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3554 ;; ;; Compare conses at runtime, there's no real upside to |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3555 ;; ;; unrolling the function -> they fall through to the next |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3556 ;; ;; clause in this function. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3557 ;; (and (cl-const-expr-p x) (not (consp x)) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3558 ;; (not (cl-const-expr-p y)))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3559 ;; ;; All other types; use equal. |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3560 ;; (cons 'equal (cdr form))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3561 ;; ;; Neither side is a constant expression, do all our evaluation at |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3562 ;; ;; runtime (or both are, and equalp will be called from |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3563 ;; ;; byte-optimize.el). |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3564 ;; (t form))))) |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4885
diff
changeset
|
3565 |
|
4810
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3566 (define-compiler-macro map (&whole form cl-type cl-func cl-seq |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3567 &rest cl-rest) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3568 "If CL-TYPE is a constant expression that we know how to handle, transform |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3569 the call to `map' to a more efficient expression." |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3570 (cond |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3571 ;; The first two here rely on the compiler macros for mapc and mapcar*, |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3572 ;; to convert to mapc-internal and mapcar, where appropriate (that is, in |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3573 ;; the absence of cl-rest.) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3574 ((null cl-type) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3575 `(prog1 nil (mapc ,@(nthcdr 2 form)))) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3576 ((equal '(quote list) cl-type) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3577 (cons 'mapcar* (nthcdr 2 form))) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3578 ((or (equal '(quote vector) cl-type) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3579 (equal '(quote array) cl-type)) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3580 (if cl-rest |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3581 `(vconcat (mapcar* ,@(nthcdr 2 form))) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3582 (cons 'mapvector (nthcdr 2 form)))) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3583 ((equal '(quote string) cl-type) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3584 `(concat (mapcar* ,@(nthcdr 2 form)))) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3585 ((equal '(quote bit-vector) cl-type) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3586 `(bvconcat (mapcar* ,@(nthcdr 2 form)))) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3587 (t form))) |
|
6ee5e50a8772
Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4794
diff
changeset
|
3588 |
| 428 | 3589 (mapc |
| 3590 #'(lambda (y) | |
| 3591 (put (car y) 'side-effect-free t) | |
| 3592 (put (car y) 'byte-compile 'cl-byte-compile-compiler-macro) | |
| 3593 (put (car y) 'cl-compiler-macro | |
| 3594 (list 'lambda '(w x) | |
| 3595 (if (symbolp (cadr y)) | |
| 3596 (list 'list (list 'quote (cadr y)) | |
| 3597 (list 'list (list 'quote (caddr y)) 'x)) | |
| 3598 (cons 'list (cdr y)))))) | |
| 3599 '((first 'car x) (second 'cadr x) (third 'caddr x) (fourth 'cadddr x) | |
| 3600 (fifth 'nth 4 x) (sixth 'nth 5 x) (seventh 'nth 6 x) | |
| 3601 (eighth 'nth 7 x) (ninth 'nth 8 x) (tenth 'nth 9 x) | |
| 3602 (rest 'cdr x) (endp 'null x) (plusp '> x 0) (minusp '< x 0) | |
| 446 | 3603 (oddp 'eq (list 'logand x 1) 1) |
| 3604 (evenp 'eq (list 'logand x 1) 0) | |
| 428 | 3605 (caar car car) (cadr car cdr) (cdar cdr car) (cddr cdr cdr) |
| 3606 (caaar car caar) (caadr car cadr) (cadar car cdar) | |
| 3607 (caddr car cddr) (cdaar cdr caar) (cdadr cdr cadr) | |
| 3608 (cddar cdr cdar) (cdddr cdr cddr) (caaaar car caaar) | |
| 3609 (caaadr car caadr) (caadar car cadar) (caaddr car caddr) | |
| 3610 (cadaar car cdaar) (cadadr car cdadr) (caddar car cddar) | |
| 3611 (cadddr car cdddr) (cdaaar cdr caaar) (cdaadr cdr caadr) | |
| 3612 (cdadar cdr cadar) (cdaddr cdr caddr) (cddaar cdr cdaar) | |
| 3613 (cddadr cdr cdadr) (cdddar cdr cddar) (cddddr cdr cdddr))) | |
| 3614 | |
| 3615 ;;; Things that are inline. | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3616 (proclaim '(inline acons map concatenate notany notevery |
| 2153 | 3617 ;; XEmacs omission: gethash is builtin |
| 3618 cl-set-elt revappend nreconc)) | |
| 428 | 3619 |
| 3620 ;;; Things that are side-effect-free. Moved to byte-optimize.el | |
| 2153 | 3621 ;(mapcar (function (lambda (x) (put x 'side-effect-free t))) |
| 3622 ; '(oddp evenp signum last butlast ldiff pairlis gcd lcm | |
| 3623 ; isqrt floor* ceiling* truncate* round* mod* rem* subseq | |
| 3624 ; list-length get* getf)) | |
| 428 | 3625 |
| 3626 ;;; Things that are side-effect-and-error-free. Moved to byte-optimize.el | |
| 2153 | 3627 ;(mapcar (function (lambda (x) (put x 'side-effect-free 'error-free))) |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4820
diff
changeset
|
3628 ; '(eql list* subst acons equalp random-state-p |
| 2153 | 3629 ; copy-tree sublis)) |
| 428 | 3630 |
| 3631 | |
| 3632 (run-hooks 'cl-macs-load-hook) | |
| 3633 | |
| 2153 | 3634 ;;; arch-tag: afd947a6-b553-4df1-bba5-000be6388f46 |
| 428 | 3635 ;;; cl-macs.el ends here |