Mercurial > hg > xemacs-beta
annotate lisp/cl.el @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | d1b17a33450b |
| children | 22c4e67a2e69 0af042a0c116 |
| rev | line source |
|---|---|
| 613 | 1 ;;; cl.el --- Common Lisp extensions for XEmacs Lisp |
| 428 | 2 |
| 3 ;; Copyright (C) 1993, 1997 Free Software Foundation, Inc. | |
|
5066
545ec923b4eb
add documentation on keywords to cl*.el
Ben Wing <ben@xemacs.org>
parents:
4995
diff
changeset
|
4 ;; Copyright (C) 2010 Ben Wing. |
| 428 | 5 |
| 6 ;; Author: Dave Gillespie <daveg@synaptics.com> | |
| 7 ;; Maintainer: XEmacs Development Team | |
| 8 ;; Version: 2.02 | |
| 9 ;; Keywords: extensions, dumped, lisp | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
| 25 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 26 ;; 02111-1307, USA. | |
| 27 | |
| 2153 | 28 ;;; Synched up with: FSF 21.3. |
| 428 | 29 |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; This file is dumped with XEmacs. | |
| 33 | |
| 34 ;; These are extensions to Emacs Lisp that provide a degree of | |
| 35 ;; Common Lisp compatibility, beyond what is already built-in | |
| 36 ;; in Emacs Lisp. | |
| 37 ;; | |
| 38 ;; This package was written by Dave Gillespie; it is a complete | |
| 39 ;; rewrite of Cesar Quiroz's original cl.el package of December 1986. | |
| 40 ;; | |
| 41 ;; Bug reports, comments, and suggestions are welcome! | |
| 42 | |
| 43 ;; This file contains the portions of the Common Lisp extensions | |
| 44 ;; package which should always be present. | |
| 45 | |
| 46 | |
| 47 ;;; Future notes: | |
| 48 | |
| 49 ;; Once Emacs 19 becomes standard, many things in this package which are | |
| 50 ;; messy for reasons of compatibility can be greatly simplified. For now, | |
| 51 ;; I prefer to maintain one unified version. | |
| 52 | |
| 53 | |
| 54 ;;; Change Log: | |
| 55 | |
| 56 ;; Version 2.02 (30 Jul 93): | |
| 57 ;; * Added "cl-compat.el" file, extra compatibility with old package. | |
| 58 ;; * Added `lexical-let' and `lexical-let*'. | |
| 59 ;; * Added `define-modify-macro', `callf', and `callf2'. | |
| 60 ;; * Added `ignore-errors'. | |
| 61 ;; * Changed `(setf (nthcdr N PLACE) X)' to work when N is zero. | |
| 62 ;; * Merged `*gentemp-counter*' into `*gensym-counter*'. | |
| 63 ;; * Extended `subseq' to allow negative START and END like `substring'. | |
| 64 ;; * Added `in-ref', `across-ref', `elements of-ref' loop clauses. | |
| 65 ;; * Added `concat', `vconcat' loop clauses. | |
| 66 ;; * Cleaned up a number of compiler warnings. | |
| 67 | |
| 68 ;; Version 2.01 (7 Jul 93): | |
| 69 ;; * Added support for FSF version of Emacs 19. | |
| 70 ;; * Added `add-hook' for Emacs 18 users. | |
| 71 ;; * Added `defsubst*' and `symbol-macrolet'. | |
| 72 ;; * Added `maplist', `mapc', `mapl', `mapcan', `mapcon'. | |
| 73 ;; * Added `map', `concatenate', `reduce', `merge'. | |
| 74 ;; * Added `revappend', `nreconc', `tailp', `tree-equal'. | |
| 75 ;; * Added `assert', `check-type', `typecase', `typep', and `deftype'. | |
| 76 ;; * Added destructuring and `&environment' support to `defmacro*'. | |
| 77 ;; * Added destructuring to `loop', and added the following clauses: | |
| 78 ;; `elements', `frames', `overlays', `intervals', `buffers', `key-seqs'. | |
| 79 ;; * Renamed `delete' to `delete*' and `remove' to `remove*'. | |
| 80 ;; * Completed support for all keywords in `remove*', `substitute', etc. | |
| 81 ;; * Added `most-positive-float' and company. | |
| 82 ;; * Fixed hash tables to work with latest Lucid Emacs. | |
| 83 ;; * `proclaim' forms are no longer compile-time-evaluating; use `declaim'. | |
| 84 ;; * Syntax for `warn' declarations has changed. | |
| 85 ;; * Improved implementation of `random*'. | |
| 86 ;; * Moved most sequence functions to a new file, cl-seq.el. | |
| 87 ;; * Moved `eval-when' into cl-macs.el. | |
| 88 ;; * Moved `pushnew' and `adjoin' to cl.el for most common cases. | |
| 89 ;; * Moved `provide' forms down to ends of files. | |
| 90 ;; * Changed expansion of `pop' to something that compiles to better code. | |
| 91 ;; * Changed so that no patch is required for Emacs 19 byte compiler. | |
| 92 ;; * Made more things dependent on `optimize' declarations. | |
| 93 ;; * Added a partial implementation of struct print functions. | |
| 94 ;; * Miscellaneous minor changes. | |
| 95 | |
| 96 ;; Version 2.00: | |
| 97 ;; * First public release of this package. | |
| 98 | |
| 99 | |
| 100 ;;; Code: | |
| 101 | |
| 102 (defvar cl-optimize-speed 1) | |
| 103 (defvar cl-optimize-safety 1) | |
| 104 | |
| 105 (defvar custom-print-functions nil | |
| 106 "This is a list of functions that format user objects for printing. | |
| 107 Each function is called in turn with three arguments: the object, the | |
| 108 stream, and the print level (currently ignored). If it is able to | |
| 109 print the object it returns true; otherwise it returns nil and the | |
| 110 printer proceeds to the next function on the list. | |
| 111 | |
| 112 This variable is not used at present, but it is defined in hopes that | |
| 113 a future Emacs interpreter will be able to use it.") | |
| 114 | |
| 115 ;;; Predicates. | |
| 116 | |
| 117 (defun eql (a b) ; See compiler macro in cl-macs.el | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
118 "Return t if the arguments are the same Lisp object, or numerically equal. |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
119 |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
120 They must be of the same type; the difference between `eq' and `eql' is most |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
121 relevant when it comes to the non-fixnum number types. In this |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
122 implementation, fixnums of the same numeric value are always `eq', but this |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
123 is not true for other numeric types, among them floats, bignums and ratios, |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
124 if available. |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
125 |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
126 See also `=' (which doesn't require that its arguments be of the same type, |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
127 but only accepts numeric arguments, characters and markers) and `equal'." |
|
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
128 (or (eq a b) (and (numberp a) (equal a b)))) |
| 428 | 129 |
| 130 ;;; Generalized variables. These macros are defined here so that they | |
| 131 ;;; can safely be used in .emacs files. | |
| 132 | |
| 133 (defmacro incf (place &optional x) | |
| 3343 | 134 "Increment PLACE by X (1 by default). |
| 428 | 135 PLACE may be a symbol, or any generalized variable allowed by `setf'. |
| 136 The return value is the incremented value of PLACE." | |
| 137 (if (symbolp place) | |
| 138 (list 'setq place (if x (list '+ place x) (list '1+ place))) | |
| 139 ;; XEmacs byte-compiler optimizes (+ FOO 1) to (1+ FOO), so this | |
| 140 ;; is OK. | |
| 141 (list 'callf '+ place (or x 1)))) | |
| 142 | |
| 143 (defmacro decf (place &optional x) | |
| 3343 | 144 "Decrement PLACE by X (1 by default). |
| 428 | 145 PLACE may be a symbol, or any generalized variable allowed by `setf'. |
| 146 The return value is the decremented value of PLACE." | |
| 147 (if (symbolp place) | |
| 148 (list 'setq place (if x (list '- place x) (list '1- place))) | |
| 149 (list 'callf '- place (or x 1)))) | |
| 150 | |
| 151 (defmacro pop (place) | |
| 3343 | 152 "Remove and return the head of the list stored in PLACE. |
| 428 | 153 Analogous to (prog1 (car PLACE) (setf PLACE (cdr PLACE))), though more |
| 154 careful about evaluating each argument only once and in the right order. | |
| 155 PLACE may be a symbol, or any generalized variable allowed by `setf'." | |
| 156 (if (symbolp place) | |
| 157 `(car (prog1 ,place (setq ,place (cdr ,place)))) | |
| 158 (cl-do-pop place))) | |
| 159 | |
| 3343 | 160 (defmacro push (newelt listname) |
| 3355 | 161 "Add NEWELT at the beginning of the list stored in LISTNAME. |
| 162 Analogous to (setf LISTNAME (cons NEWELT LISTNAME)), though more careful | |
| 163 about evaluating each argument only once and in the right order. LISTNAME | |
| 164 may be a symbol, or any generalized variable allowed by `setf'; that is, it | |
| 165 does not necessarily have to be a list, though `push' is most often used on | |
| 166 lists. " | |
| 3343 | 167 (if (symbolp listname) `(setq ,listname (cons ,newelt ,listname)) |
| 168 (list 'callf2 'cons newelt listname))) | |
| 428 | 169 |
| 3343 | 170 (defmacro pushnew (newelt listname &rest keys) |
| 3355 | 171 "Add NEWELT at the beginning of LISTNAME, unless it's already in LISTNAME. |
| 3343 | 172 Like (push NEWELT LISTNAME), except that the list is unmodified if NEWELT is |
| 173 `eql' to an element already on the list. | |
|
5066
545ec923b4eb
add documentation on keywords to cl*.el
Ben Wing <ben@xemacs.org>
parents:
4995
diff
changeset
|
174 Keywords supported: :test :test-not :key |
|
545ec923b4eb
add documentation on keywords to cl*.el
Ben Wing <ben@xemacs.org>
parents:
4995
diff
changeset
|
175 See `member*' for the meaning of :test, :test-not and :key." |
| 3343 | 176 (if (symbolp listname) (list 'setq listname |
| 177 (list* 'adjoin newelt listname keys)) | |
| 178 (list* 'callf2 'adjoin newelt listname keys))) | |
| 428 | 179 |
| 180 (defun cl-set-elt (seq n val) | |
| 181 (if (listp seq) (setcar (nthcdr n seq) val) (aset seq n val))) | |
| 182 | |
| 183 (defun cl-set-nthcdr (n list x) | |
| 184 (if (<= n 0) x (setcdr (nthcdr (1- n) list) x) list)) | |
| 185 | |
| 186 (defun cl-set-buffer-substring (start end val) | |
| 187 (save-excursion (delete-region start end) | |
| 188 (goto-char start) | |
| 189 (insert val) | |
| 190 val)) | |
| 191 | |
| 192 (defun cl-set-substring (str start end val) | |
| 193 (if end (if (< end 0) (incf end (length str))) | |
| 194 (setq end (length str))) | |
| 2136 | 195 (if (< start 0) (incf start (length str))) |
| 428 | 196 (concat (and (> start 0) (substring str 0 start)) |
| 197 val | |
| 198 (and (< end (length str)) (substring str end)))) | |
| 199 | |
| 200 ;;; Control structures. | |
| 201 | |
| 202 ;; The macros `when' and `unless' are so useful that we want them to | |
| 203 ;; ALWAYS be available. So they've been moved from cl.el to eval.c. | |
| 204 ;; Note: FSF Emacs moved them to subr.el in FSF 20. | |
| 205 | |
| 2153 | 206 (defalias 'cl-map-extents 'map-extents) |
| 428 | 207 |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
208 ;;; XEmacs; multiple values are in eval.c and cl-macs.el. |
| 2153 | 209 |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
210 ;;; We no longer support `multiple-value-apply', which was ill-conceived to |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
211 ;;; start with, is not specified by Common Lisp, and which nothing uses, |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
212 ;;; according to Google Code Search, as of Sat Mar 14 23:31:35 GMT 2009. |
| 2153 | 213 |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
3355
diff
changeset
|
214 (make-obsolete 'multiple-value-apply 'multiple-value-call) |
| 428 | 215 |
| 216 ;;; Macros. | |
| 217 | |
| 218 (defvar cl-macro-environment nil) | |
| 219 ;; XEmacs: we renamed the internal function to macroexpand-internal | |
| 220 ;; to avoid doc-file problems. | |
| 221 (defvar cl-old-macroexpand (prog1 (symbol-function 'macroexpand-internal) | |
| 222 (defalias 'macroexpand 'cl-macroexpand))) | |
| 223 | |
| 224 (defun cl-macroexpand (cl-macro &optional cl-env) | |
| 225 "Return result of expanding macros at top level of FORM. | |
| 226 If FORM is not a macro call, it is returned unchanged. | |
| 227 Otherwise, the macro is expanded and the expansion is considered | |
| 228 in place of FORM. When a non-macro-call results, it is returned. | |
| 229 | |
| 442 | 230 The second optional arg ENVIRONMENT specifies an environment of macro |
| 428 | 231 definitions to shadow the loaded ones for use in file byte-compilation." |
| 232 (let ((cl-macro-environment cl-env)) | |
| 233 (while (progn (setq cl-macro (funcall cl-old-macroexpand cl-macro cl-env)) | |
| 234 (and (symbolp cl-macro) | |
| 235 (cdr (assq (symbol-name cl-macro) cl-env)))) | |
| 236 (setq cl-macro (cadr (assq (symbol-name cl-macro) cl-env)))) | |
| 237 cl-macro)) | |
| 238 | |
| 239 ;;; Declarations. | |
| 240 | |
| 241 (defvar cl-compiling-file nil) | |
| 242 (defun cl-compiling-file () | |
| 243 (or cl-compiling-file | |
| 244 ;; XEmacs change | |
| 245 ; (and (boundp 'outbuffer) (bufferp (symbol-value 'outbuffer)) | |
| 246 ; (equal (buffer-name (symbol-value 'outbuffer)) | |
| 247 ; " *Compiler Output*")) | |
| 248 (and (boundp 'byte-compile-outbuffer) | |
| 249 (bufferp (symbol-value 'byte-compile-outbuffer)) | |
| 250 (equal (buffer-name (symbol-value 'byte-compile-outbuffer)) | |
| 251 " *Compiler Output*")) | |
| 252 )) | |
| 253 | |
| 254 (defvar cl-proclaims-deferred nil) | |
| 255 | |
| 256 (defun proclaim (spec) | |
| 257 (if (fboundp 'cl-do-proclaim) (cl-do-proclaim spec t) | |
| 258 (push spec cl-proclaims-deferred)) | |
| 259 nil) | |
| 260 | |
| 261 (defmacro declaim (&rest specs) | |
| 262 (let ((body (mapcar (function (lambda (x) (list 'proclaim (list 'quote x)))) | |
| 263 specs))) | |
| 264 (if (cl-compiling-file) (list* 'eval-when '(compile load eval) body) | |
| 265 (cons 'progn body)))) ; avoid loading cl-macs.el for eval-when | |
| 266 | |
| 267 ;;; Symbols. | |
| 268 | |
| 269 (defun cl-random-time () | |
| 270 (let* ((time (copy-sequence (current-time-string))) (i (length time)) (v 0)) | |
| 271 (while (>= (decf i) 0) (setq v (+ (* v 3) (aref time i)))) | |
| 2509 | 272 (if-fboundp 'coerce-number |
| 273 (coerce-number v 'fixnum) | |
| 1983 | 274 v))) |
| 428 | 275 |
| 276 (defvar *gensym-counter* (* (logand (cl-random-time) 1023) 100)) | |
| 277 | |
| 2153 | 278 ;; XEmacs change: gensym and gentemp moved here from cl-macs.el |
| 442 | 279 (defun gensym (&optional arg) |
| 280 "Generate a new uninterned symbol. | |
| 2071 | 281 The name is made by appending a number to a prefix. If ARG is a string, it |
| 282 is the prefix, otherwise the prefix defaults to \"G\". If ARG is an integer, | |
| 283 the internal counter is reset to that number before creating the name. | |
| 284 There is no way to specify both using this function." | |
| 442 | 285 (let ((prefix (if (stringp arg) arg "G")) |
| 286 (num (if (integerp arg) arg | |
| 287 (prog1 *gensym-counter* | |
| 288 (setq *gensym-counter* (1+ *gensym-counter*)))))) | |
| 289 (make-symbol (format "%s%d" prefix num)))) | |
| 290 | |
| 291 (defun gentemp (&optional arg) | |
| 292 "Generate a new interned symbol with a unique name. | |
| 2071 | 293 The name is made by appending a number to ARG, default \"G\". |
| 294 If ARG is not a string, it is ignored." | |
| 442 | 295 (let ((prefix (if (stringp arg) arg "G")) |
| 296 name) | |
| 297 (while (intern-soft (setq name (format "%s%d" prefix *gensym-counter*))) | |
| 298 (setq *gensym-counter* (1+ *gensym-counter*))) | |
| 299 (intern name))) | |
| 428 | 300 |
| 301 ;;; Numbers. | |
| 302 | |
|
4885
6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents:
4783
diff
changeset
|
303 ;; XEmacs change: ditch floatp-safe. |
| 428 | 304 |
| 446 | 305 (defun plusp (number) |
| 428 | 306 "Return t if NUMBER is positive." |
| 446 | 307 (> number 0)) |
| 308 | |
| 309 (defun minusp (number) | |
| 310 "Return t if NUMBER is negative." | |
| 311 (< number 0)) | |
| 428 | 312 |
| 446 | 313 (defun oddp (integer) |
| 428 | 314 "Return t if INTEGER is odd." |
| 446 | 315 (eq (logand integer 1) 1)) |
| 428 | 316 |
| 446 | 317 (defun evenp (integer) |
| 428 | 318 "Return t if INTEGER is even." |
| 446 | 319 (eq (logand integer 1) 0)) |
| 428 | 320 |
| 2153 | 321 ;; XEmacs addition |
| 322 (defalias 'cl-abs 'abs) | |
| 428 | 323 |
| 324 (defvar *random-state* (vector 'cl-random-state-tag -1 30 (cl-random-time))) | |
| 325 | |
| 326 ;;; The following are set by code in cl-extra.el | |
| 327 (defconst most-positive-float nil | |
| 328 "The float closest in value to positive infinity.") | |
| 329 (defconst most-negative-float nil | |
| 330 "The float closest in value to negative infinity.") | |
| 331 (defconst least-positive-float nil | |
| 332 "The positive float closest in value to 0.") | |
| 333 (defconst least-negative-float nil | |
| 334 "The negative float closest in value to 0.") | |
| 335 (defconst least-positive-normalized-float nil) | |
| 336 (defconst least-negative-normalized-float nil) | |
| 337 (defconst float-epsilon nil) | |
| 338 (defconst float-negative-epsilon nil) | |
| 339 | |
| 340 ;;; Sequence functions. | |
| 341 | |
| 342 (defalias 'copy-seq 'copy-sequence) | |
| 343 | |
|
5219
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
344 ;; 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
|
345 |
|
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
346 (defalias 'svref 'aref) ;; Compiler macro in cl-macs.el |
| 428 | 347 |
| 348 ;;; List functions. | |
| 349 | |
| 350 ;; These functions are made known to the byte-compiler by cl-macs.el | |
| 351 ;; and turned into efficient car and cdr bytecodes. | |
| 352 | |
| 353 (defalias 'first 'car) | |
| 354 (defalias 'rest 'cdr) | |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
355 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
356 ;; 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
|
357 (defun endp (list) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
358 "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
|
359 (prog1 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
360 (null list) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
361 (and list (atom list) (error 'wrong-type-argument #'listp list)))) |
| 428 | 362 |
| 2153 | 363 ;; XEmacs change: make it a real function |
| 428 | 364 (defun second (x) |
| 365 "Return the second element of the list LIST." | |
| 366 (car (cdr x))) | |
| 367 | |
| 368 (defun third (x) | |
| 2153 | 369 "Return the third element of the list X." |
| 428 | 370 (car (cdr (cdr x)))) |
| 371 | |
| 372 (defun fourth (x) | |
| 2153 | 373 "Return the fourth element of the list X." |
| 428 | 374 (nth 3 x)) |
| 375 | |
| 376 (defun fifth (x) | |
| 2153 | 377 "Return the fifth element of the list X." |
| 428 | 378 (nth 4 x)) |
| 379 | |
| 380 (defun sixth (x) | |
| 2153 | 381 "Return the sixth element of the list X." |
| 428 | 382 (nth 5 x)) |
| 383 | |
| 384 (defun seventh (x) | |
| 2153 | 385 "Return the seventh element of the list X." |
| 428 | 386 (nth 6 x)) |
| 387 | |
| 388 (defun eighth (x) | |
| 2153 | 389 "Return the eighth element of the list X." |
| 428 | 390 (nth 7 x)) |
| 391 | |
| 392 (defun ninth (x) | |
| 2153 | 393 "Return the ninth element of the list X." |
| 428 | 394 (nth 8 x)) |
| 395 | |
| 396 (defun tenth (x) | |
| 2153 | 397 "Return the tenth element of the list X." |
| 428 | 398 (nth 9 x)) |
| 399 | |
| 2153 | 400 ;; XEmacs change: Emacs defines caar, cadr, cdar, and cddr in subr.el. |
| 428 | 401 (defun caar (x) |
| 402 "Return the `car' of the `car' of X." | |
| 403 (car (car x))) | |
| 404 | |
| 405 (defun cadr (x) | |
| 406 "Return the `car' of the `cdr' of X." | |
| 407 (car (cdr x))) | |
| 408 | |
| 409 (defun cdar (x) | |
| 410 "Return the `cdr' of the `car' of X." | |
| 411 (cdr (car x))) | |
| 412 | |
| 413 (defun cddr (x) | |
| 414 "Return the `cdr' of the `cdr' of X." | |
| 415 (cdr (cdr x))) | |
| 416 | |
| 417 (defun caaar (x) | |
| 418 "Return the `car' of the `car' of the `car' of X." | |
| 419 (car (car (car x)))) | |
| 420 | |
| 421 (defun caadr (x) | |
| 422 "Return the `car' of the `car' of the `cdr' of X." | |
| 423 (car (car (cdr x)))) | |
| 424 | |
| 425 (defun cadar (x) | |
| 426 "Return the `car' of the `cdr' of the `car' of X." | |
| 427 (car (cdr (car x)))) | |
| 428 | |
| 429 (defun caddr (x) | |
| 430 "Return the `car' of the `cdr' of the `cdr' of X." | |
| 431 (car (cdr (cdr x)))) | |
| 432 | |
| 433 (defun cdaar (x) | |
| 434 "Return the `cdr' of the `car' of the `car' of X." | |
| 435 (cdr (car (car x)))) | |
| 436 | |
| 437 (defun cdadr (x) | |
| 438 "Return the `cdr' of the `car' of the `cdr' of X." | |
| 439 (cdr (car (cdr x)))) | |
| 440 | |
| 441 (defun cddar (x) | |
| 442 "Return the `cdr' of the `cdr' of the `car' of X." | |
| 443 (cdr (cdr (car x)))) | |
| 444 | |
| 445 (defun cdddr (x) | |
| 446 "Return the `cdr' of the `cdr' of the `cdr' of X." | |
| 447 (cdr (cdr (cdr x)))) | |
| 448 | |
| 449 (defun caaaar (x) | |
| 450 "Return the `car' of the `car' of the `car' of the `car' of X." | |
| 451 (car (car (car (car x))))) | |
| 452 | |
| 453 (defun caaadr (x) | |
| 454 "Return the `car' of the `car' of the `car' of the `cdr' of X." | |
| 455 (car (car (car (cdr x))))) | |
| 456 | |
| 457 (defun caadar (x) | |
| 458 "Return the `car' of the `car' of the `cdr' of the `car' of X." | |
| 459 (car (car (cdr (car x))))) | |
| 460 | |
| 461 (defun caaddr (x) | |
| 462 "Return the `car' of the `car' of the `cdr' of the `cdr' of X." | |
| 463 (car (car (cdr (cdr x))))) | |
| 464 | |
| 465 (defun cadaar (x) | |
| 466 "Return the `car' of the `cdr' of the `car' of the `car' of X." | |
| 467 (car (cdr (car (car x))))) | |
| 468 | |
| 469 (defun cadadr (x) | |
| 470 "Return the `car' of the `cdr' of the `car' of the `cdr' of X." | |
| 471 (car (cdr (car (cdr x))))) | |
| 472 | |
| 473 (defun caddar (x) | |
| 474 "Return the `car' of the `cdr' of the `cdr' of the `car' of X." | |
| 475 (car (cdr (cdr (car x))))) | |
| 476 | |
| 477 (defun cadddr (x) | |
| 478 "Return the `car' of the `cdr' of the `cdr' of the `cdr' of X." | |
| 479 (car (cdr (cdr (cdr x))))) | |
| 480 | |
| 481 (defun cdaaar (x) | |
| 482 "Return the `cdr' of the `car' of the `car' of the `car' of X." | |
| 483 (cdr (car (car (car x))))) | |
| 484 | |
| 485 (defun cdaadr (x) | |
| 486 "Return the `cdr' of the `car' of the `car' of the `cdr' of X." | |
| 487 (cdr (car (car (cdr x))))) | |
| 488 | |
| 489 (defun cdadar (x) | |
| 490 "Return the `cdr' of the `car' of the `cdr' of the `car' of X." | |
| 491 (cdr (car (cdr (car x))))) | |
| 492 | |
| 493 (defun cdaddr (x) | |
| 494 "Return the `cdr' of the `car' of the `cdr' of the `cdr' of X." | |
| 495 (cdr (car (cdr (cdr x))))) | |
| 496 | |
| 497 (defun cddaar (x) | |
| 498 "Return the `cdr' of the `cdr' of the `car' of the `car' of X." | |
| 499 (cdr (cdr (car (car x))))) | |
| 500 | |
| 501 (defun cddadr (x) | |
| 502 "Return the `cdr' of the `cdr' of the `car' of the `cdr' of X." | |
| 503 (cdr (cdr (car (cdr x))))) | |
| 504 | |
| 505 (defun cdddar (x) | |
| 506 "Return the `cdr' of the `cdr' of the `cdr' of the `car' of X." | |
| 507 (cdr (cdr (cdr (car x))))) | |
| 508 | |
| 509 (defun cddddr (x) | |
| 510 "Return the `cdr' of the `cdr' of the `cdr' of the `cdr' of X." | |
| 511 (cdr (cdr (cdr (cdr x))))) | |
| 512 | |
| 513 ;;; `last' is implemented as a C primitive, as of 1998-11 | |
| 514 | |
|
5281
aa20a889ff14
Remove a couple of redundant functions, backquote.el
Aidan Kehoe <kehoea@parhasard.net>
parents:
5219
diff
changeset
|
515 ;;; XEmacs: `list*' is in subr.el. |
| 428 | 516 |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
517 ;; 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
|
518 ;; not a list. |
| 428 | 519 (defun ldiff (list sublist) |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
520 "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
|
521 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
522 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
|
523 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
|
524 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
|
525 `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
|
526 (check-argument-type #'listp list) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
527 (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
|
528 (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
|
529 (prog1 |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
530 (setq result (list (car list))) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
531 (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
|
532 (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
|
533 (setq result (cdr result) |
|
5285
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
534 evenp (not evenp)) |
|
99de5fd48e87
Tighten up Common Lisp compatibility, #'butlast, #'nbutlast, #'tailp, #'ldiff
Aidan Kehoe <kehoea@parhasard.net>
parents:
5281
diff
changeset
|
535 (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
|
536 (if (eq before list) (error 'circular-list list))))))) |
| 428 | 537 |
| 538 ;;; `copy-list' is implemented as a C primitive, as of 1998-11 | |
| 539 | |
| 540 (defalias 'cl-member 'memq) ; for compatibility with old CL package | |
| 541 (defalias 'cl-floor 'floor*) | |
| 542 (defalias 'cl-ceiling 'ceiling*) | |
| 543 (defalias 'cl-truncate 'truncate*) | |
| 544 (defalias 'cl-round 'round*) | |
| 545 (defalias 'cl-mod 'mod*) | |
| 546 | |
|
5219
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
547 (defun acons (key value alist) |
| 428 | 548 "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
|
549 (cons (cons key value) alist)) |
| 428 | 550 |
|
5219
2d0937dc83cf
Tidying of CL files; make docstrings read better, remove commented-out code
Aidan Kehoe <kehoea@parhasard.net>
parents:
5066
diff
changeset
|
551 (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
|
552 "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
|
553 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
|
554 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
|
555 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
|
556 (nconc (mapcar* 'cons keys values) alist)) |
| 428 | 557 |
| 558 ;;; Miscellaneous. | |
| 559 | |
| 560 ;; XEmacs change | |
| 561 (define-error 'cl-assertion-failed "Assertion failed") | |
| 562 | |
|
5318
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
563 ;; 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
|
564 (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
|
565 (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
|
566 |
|
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
567 (map-plist |
|
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
568 #'(lambda (key value) |
|
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
569 (mapc #'(lambda (error) |
|
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
570 (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
|
571 (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
|
572 value)) |
|
203dcac81dae
Provide some milquetoast compatibility in our errors, type-error, program-error
Aidan Kehoe <kehoea@parhasard.net>
parents:
5294
diff
changeset
|
573 '(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
|
574 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
|
575 |
| 2153 | 576 ;; XEmacs change: omit the autoload rules; we handle those a different way |
| 428 | 577 |
| 578 ;;; 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
|
579 (mapc |
| 428 | 580 #'(lambda (entry) |
|
4995
8431b52e43b1
Move the various map* functions to C; add #'map-into.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4885
diff
changeset
|
581 (mapc |
| 428 | 582 #'(lambda (func) |
| 583 (put func 'lisp-indent-function (nth 1 entry)) | |
| 584 (put func 'lisp-indent-hook (nth 1 entry)) | |
| 585 (or (get func 'edebug-form-spec) | |
| 586 (put func 'edebug-form-spec (nth 2 entry)))) | |
| 587 (car entry))) | |
| 588 '(((defun* defmacro*) defun) | |
| 589 ((function*) nil | |
| 590 (&or symbolp ([&optional 'macro] 'lambda (&rest sexp) &rest form))) | |
| 591 ((eval-when) 1 (sexp &rest form)) | |
| 592 ((when unless) 1 (&rest form)) | |
| 593 ((declare) nil (&rest sexp)) | |
| 594 ((the) 1 (sexp &rest form)) | |
| 595 ((case ecase typecase etypecase) 1 (form &rest (sexp &rest form))) | |
| 596 ((block return-from) 1 (sexp &rest form)) | |
| 597 ((return) nil (&optional form)) | |
| 598 ((do do*) 2 ((&rest &or symbolp (symbolp &optional form form)) | |
| 599 (form &rest form) | |
| 600 &rest form)) | |
| 601 ((dolist dotimes) 1 ((symbolp form &rest form) &rest form)) | |
| 602 ((do-symbols) 1 ((symbolp form &optional form form) &rest form)) | |
| 603 ((do-all-symbols) 1 ((symbolp form &optional form) &rest form)) | |
| 604 ((psetq setf psetf) nil edebug-setq-form) | |
| 605 ((progv) 2 (&rest form)) | |
| 606 ((flet labels macrolet) 1 | |
| 607 ((&rest (sexp sexp &rest form)) &rest form)) | |
| 608 ((symbol-macrolet lexical-let lexical-let*) 1 | |
| 609 ((&rest &or symbolp (symbolp form)) &rest form)) | |
| 610 ((multiple-value-bind) 2 ((&rest symbolp) &rest form)) | |
| 611 ((multiple-value-setq) 1 ((&rest symbolp) &rest form)) | |
| 612 ((incf decf remf pop push pushnew shiftf rotatef) nil (&rest form)) | |
| 613 ((letf letf*) 1 ((&rest (&rest form)) &rest form)) | |
| 614 ((callf destructuring-bind) 2 (sexp form &rest form)) | |
| 615 ((callf2) 3 (sexp form form &rest form)) | |
| 616 ((loop) defun (&rest &or symbolp form)) | |
| 617 ((ignore-errors) 0 (&rest form)))) | |
| 618 | |
| 619 ;;; 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
|
620 (provide 'cl-19) |
| 428 | 621 |
| 622 ;;; Things to do after byte-compiler is loaded. | |
| 623 ;;; As a side effect, we cause cl-macs to be loaded when compiling, so | |
| 624 ;;; that the compiler-macros defined there will be present. | |
| 625 | |
| 626 (defvar cl-hacked-flag nil) | |
| 627 (defun cl-hack-byte-compiler () | |
| 628 (if (and (not cl-hacked-flag) (fboundp 'byte-compile-file-form)) | |
| 629 (progn | |
| 2153 | 630 (setq cl-hacked-flag t) ; Do it first, to prevent recursion. |
| 442 | 631 (when (not (fboundp 'cl-compile-time-init)) |
| 632 (load "cl-macs" nil t)) | |
| 2153 | 633 (cl-compile-time-init)))) ; In cl-macs.el. |
| 428 | 634 |
| 635 ;;; Try it now in case the compiler has already been loaded. | |
| 636 (cl-hack-byte-compiler) | |
| 637 | |
|
4683
0cc9d22c3732
Be more reliable about loading cl-macs at byte-compile time, cl.el.
Aidan Kehoe <kehoea@parhasard.net>
parents:
4677
diff
changeset
|
638 ;;; 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
|
639 (add-hook 'bytecomp-load-hook 'cl-hack-byte-compiler) |
| 428 | 640 |
| 641 ;;; The following ensures that packages which expect the old-style cl.el | |
| 642 ;;; will be happy with this one. | |
| 643 | |
| 644 (provide 'cl) | |
| 645 | |
| 646 (run-hooks 'cl-load-hook) | |
| 647 | |
| 2153 | 648 ;;; arch-tag: 5f07fa74-f153-4524-9303-21f5be125851 |
| 428 | 649 ;;; cl.el ends here |