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