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