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