annotate lisp/cl-macs.el @ 4885:6772ce4d982b

Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums lisp/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Correct the semantics of #'member*, #'eql, #'assoc* in the presence of bignums; change the integerp byte code to fixnump semantics. * bytecomp.el (fixnump, integerp, byte-compile-integerp): Change the integerp byte code to fixnump; add a byte-compile method to integerp using fixnump and numberp and avoiding a funcall most of the time, since in the non-core contexts where integerp is used, it's mostly distinguishing between fixnums and things that are not numbers at all. * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) (byte-compile-side-effect-and-error-free-ops): Replace the integerp bytecode with fixnump; add fixnump to the side-effect-free-fns. Add the other extended number type predicates to the list in passing. * obsolete.el (floatp-safe): Mark this as obsolete. * cl.el (eql): Go into more detail in the docstring here. Don't bother checking whether both arguments are numbers; one is enough, #'equal will fail correctly if they have distinct types. (subst): Replace a call to #'integerp (deciding whether to use #'memq or not) with one to #'fixnump. Delete most-positive-fixnum, most-negative-fixnum from this file; they're now always in C, so they can't be modified from Lisp. * cl-seq.el (member*, assoc*, rassoc*): Correct these functions in the presence of bignums. * cl-macs.el (cl-make-type-test): The type test for a fixnum is now fixnump. Ditch floatp-safe, use floatp instead. (eql): Correct this compiler macro in the presence of bignums. (assoc*): Correct this compiler macro in the presence of bignums. * simple.el (undo): Change #'integerp to #'fixnump here, since we use #'delq with the same value as ELT a few lines down. src/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Fix problems with #'eql, extended number types, and the hash table implementation; change the Bintegerp bytecode to fixnump semantics even on bignum builds, since #'integerp can have a fast implementation in terms of #'fixnump for most of its extant uses, but not vice-versa. * lisp.h: Always #include number.h; we want the macros provided in it, even if the various number types are not available. * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its argument is of non-immediate number type. Equivalent to FLOATP if WITH_NUMBER_TYPES is not defined. * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, giving more correct behaviour in the presence of the extended number types. * bytecode.c (Bfixnump, execute_optimized_program): Rename Bintegerp to Bfixnump; change its semantics to reflect the new name on builds with bignum support. * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): Always make #'fixnump available, even on non-BIGNUM builds; always implement #'integerp in this file, even on BIGNUM builds. Move most-positive-fixnum, most-negative-fixnum here from number.c, so they are Lisp constants even on builds without number types, and attempts to change or bind them error. Use the NUMBERP and INTEGERP macros even on builds without extended number types. * data.c (fixnum_char_or_marker_to_int): Rename this function from integer_char_or_marker_to_int, to better reflect the arguments it accepts. * number.c (Fevenp, Foddp, syms_of_number): Never provide #'integerp in this file. Remove #'oddp, #'evenp; their implementations are overridden by those in cl.el. * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. man/ChangeLog addition: 2010-01-23 Aidan Kehoe <kehoea@parhasard.net> Generally: be careful to say fixnum, not integer, when talking about fixed-precision integral types. I'm sure I've missed instances, both here and in the docstrings, but this is a decent start. * lispref/text.texi (Columns): Document where only fixnums, not integers generally, are accepted. (Registers): Remove some ancient char-int confoundance here. * lispref/strings.texi (Creating Strings, Creating Strings): Be more exact in describing where fixnums but not integers in general are accepted. (Creating Strings): Use a more contemporary example to illustrate how concat deals with lists including integers about #xFF. Delete some obsolete documentation on same. (Char Table Types): Document that only fixnums are accepted as values in syntax tables. * lispref/searching.texi (String Search, Search and Replace): Be exact in describing where fixnums but not integers in general are accepted. * lispref/range-tables.texi (Range Tables): Be exact in describing them; only fixnums are accepted to describe ranges. * lispref/os.texi (Killing XEmacs, User Identification) (Time of Day, Time Conversion): Be more exact about using fixnum where only fixed-precision integers are accepted. * lispref/objects.texi (Integer Type): Be more exact (and up-to-date) about the possible values for integers. Cross-reference to documentation of the bignum extension. (Equality Predicates): (Range Table Type): (Array Type): Use fixnum, not integer, to describe a fixed-precision integer. (Syntax Table Type): Correct some English syntax here. * lispref/numbers.texi (Numbers): Change the phrasing here to use fixnum to mean the fixed-precision integers normal in emacs. Document that our terminology deviates from that of Common Lisp, and that we're working on it. (Compatibility Issues): Reiterate the Common Lisp versus Emacs Lisp compatibility issues. (Comparison of Numbers, Arithmetic Operations): * lispref/commands.texi (Command Loop Info, Working With Events): * lispref/buffers.texi (Modification Time): Be more exact in describing where fixnums but not integers in general are accepted.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 24 Jan 2010 15:21:27 +0000
parents e6dec75ded0e
children 6ef8256a020a 8431b52e43b1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
613
023b83f4e54b [xemacs-hg @ 2001-06-10 10:42:16 by ben]
ben
parents: 452
diff changeset
1 ;;; cl-macs.el --- Common Lisp extensions for XEmacs Lisp (part four)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3 ;; Copyright (C) 1993, 2003, 2004 Free Software Foundation, Inc.
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
4 ;; Copyright (C) 2002 Ben Wing.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 ;; Author: Dave Gillespie <daveg@synaptics.com>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 ;; Version: 2.02
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 ;; Keywords: extensions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 ;; This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 ;; XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 ;; under the terms of the GNU General Public License as published by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 ;; the Free Software Foundation; either version 2, or (at your option)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 ;; any later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 ;; XEmacs is distributed in the hope that it will be useful, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 ;; General Public License for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 ;; along with XEmacs; see the file COPYING. If not, write to the Free
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 ;; 02111-1307, USA.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
27 ;;; Synched up with: FSF 21.3.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29 ;;; Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 ;; These are extensions to Emacs Lisp that provide a degree of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ;; Common Lisp compatibility, beyond what is already built-in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 ;; in Emacs Lisp.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35 ;; This package was written by Dave Gillespie; it is a complete
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 ;; rewrite of Cesar Quiroz's original cl.el package of December 1986.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 ;;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 ;; Bug reports, comments, and suggestions are welcome!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 ;; This file contains the portions of the Common Lisp extensions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41 ;; package which should be autoloaded, but need only be present
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42 ;; if the compiler or interpreter is used---this file is not
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 ;; necessary for executing compiled code.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 ;; See cl.el for Change Log.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 ;;; Code:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 (or (memq 'cl-19 features)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 (error "Tried to load `cl-macs' before `cl'!"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 (defmacro cl-pop2 (place)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 (list 'prog1 (list 'car (list 'cdr place))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 (list 'setq place (list 'cdr (list 'cdr place)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 (put 'cl-pop2 'edebug-form-spec 'edebug-sexps)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 (defvar cl-optimize-safety)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 (defvar cl-optimize-speed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 ;;; This kludge allows macros which use cl-transform-function-property
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 ;;; to be called at compile-time.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 (require
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 (or (fboundp 'cl-transform-function-property)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 (defalias 'cl-transform-function-property
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 #'(lambda (n p f)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 (list 'put (list 'quote n) (list 'quote p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 (list 'function (cons 'lambda f))))))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
73 'xemacs))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 ;;; Initialization.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 (defvar cl-old-bc-file-form nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 (defun cl-compile-time-init ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82 (run-hooks 'cl-hack-bytecomp-hook))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
85 ;;; Some predicates for analyzing Lisp forms. These are used by various
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
86 ;;; macro expanders to optimize the results in certain common cases.
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
87
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
88 (defconst cl-simple-funcs '(car cdr nth aref elt if and or + - 1+ 1- min max
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
89 car-safe cdr-safe progn prog1 prog2))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
90 (defconst cl-safe-funcs '(* / % length memq list vector vectorp
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
91 < > <= >= = error))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
92
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
93 ;;; Check if no side effects, and executes quickly.
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
94 (defun cl-simple-expr-p (x &optional size)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
95 (or size (setq size 10))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
96 (if (and (consp x) (not (memq (car x) '(quote function function*))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
97 (and (symbolp (car x))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
98 (or (memq (car x) cl-simple-funcs)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
99 (get (car x) 'side-effect-free))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
100 (progn
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
101 (setq size (1- size))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
102 (while (and (setq x (cdr x))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
103 (setq size (cl-simple-expr-p (car x) size))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
104 (and (null x) (>= size 0) size)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
105 (and (> size 0) (1- size))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
106
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
107 (defun cl-simple-exprs-p (xs)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
108 (while (and xs (cl-simple-expr-p (car xs)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
109 (setq xs (cdr xs)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
110 (not xs))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
111
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
112 ;;; Check if no side effects.
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
113 (defun cl-safe-expr-p (x)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
114 (or (not (and (consp x) (not (memq (car x) '(quote function function*)))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
115 (and (symbolp (car x))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
116 (or (memq (car x) cl-simple-funcs)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
117 (memq (car x) cl-safe-funcs)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
118 (get (car x) 'side-effect-free))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
119 (progn
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
120 (while (and (setq x (cdr x)) (cl-safe-expr-p (car x))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
121 (null x)))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
122
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
123 ;;; Check if constant (i.e., no side effects or dependencies).
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
124 (defun cl-const-expr-p (x)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
125 (cond ((consp x)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
126 (or (eq (car x) 'quote)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
127 (and (memq (car x) '(function function*))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
128 (or (symbolp (nth 1 x))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
129 (and (eq (car-safe (nth 1 x)) 'lambda) 'func)))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
130 ((symbolp x) (and (memq x '(nil t)) t))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
131 (t t)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
132
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
133 (defun cl-const-exprs-p (xs)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
134 (while (and xs (cl-const-expr-p (car xs)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
135 (setq xs (cdr xs)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
136 (not xs))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
137
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
138 (defun cl-const-expr-val (x)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
139 (and (eq (cl-const-expr-p x) t) (if (consp x) (nth 1 x) x)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
140
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
141 (defun cl-expr-access-order (x v)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
142 (if (cl-const-expr-p x) v
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
143 (if (consp x)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
144 (progn
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
145 (while (setq x (cdr x)) (setq v (cl-expr-access-order (car x) v)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
146 v)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
147 (if (eq x (car v)) (cdr v) '(t)))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
148
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
149 ;;; Count number of times X refers to Y. Return nil for 0 times.
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
150 (defun cl-expr-contains (x y)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
151 (cond ((equal y x) 1)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
152 ((and (consp x) (not (memq (car-safe x) '(quote function function*))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
153 (let ((sum 0))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
154 (while x
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
155 (setq sum (+ sum (or (cl-expr-contains (pop x) y) 0))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
156 (and (> sum 0) sum)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
157 (t nil)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
158
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
159 (defun cl-expr-contains-any (x y)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
160 (while (and y (not (cl-expr-contains x (car y)))) (pop y))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
161 y)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
162
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
163 ;;; Check whether X may depend on any of the symbols in Y.
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
164 (defun cl-expr-depends-p (x y)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
165 (and (not (cl-const-expr-p x))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
166 (or (not (cl-safe-expr-p x)) (cl-expr-contains-any x y))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
167
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
168 ;;; Symbols.
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
169
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
170 (defvar *gensym-counter*)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
171
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
172 ;; XEmacs change: gensym and gentemp have been moved to cl.el.
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
173
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
174
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
175 ;;; Program structure.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
176
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
177 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
178 (defmacro defun* (name args &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
179 "(defun* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a function.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
180 Like normal `defun', except ARGLIST allows full Common Lisp conventions,
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
181 and BODY is implicitly surrounded by (block NAME ...).
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
182
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
183 \"Full Common Lisp conventions\" means that:
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
184
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
185 -- In addition to &optional and &rest, the lambda-list keywords &key,
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
186 &allow-other-keys, and &aux are allowed.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
187
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
188 -- The format of the arguments to &optional is expanded: As well as simple
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
189 variables, they can be lists of the form (VAR [INITFORM [SVAR]]); when
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
190 no argument is available for VAR, INITFORM is evaluated (or nil, if
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
191 INITFORM is omitted) and stored as VAR's value, and SVAR is bound to t.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
192 If an arguent is available for VAR, and INITFORM is unused, SVAR is
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
193 bound to nil.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
194
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
195 -- &key specifies keyword arguments. The format of each argument is
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
196 VAR || ( { VAR || (KEYWORD VAR) } [INITFORM [SVAR]]) -- #### document me.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
197
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
198 -- &allow-other-keys means that if other keyword arguments are given that are
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
199 not specifically list in the arg list, they are allowed, rather than an
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
200 error being signalled. They can be retrieved with an &rest form.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
201
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
202 -- &aux specifies extra bindings, exactly like a `let*' enclosing the body.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
203 The format of each binding is VAR || (VAR [INITFORM]) -- exactly like the
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
204 format of `let'/`let*' bindings.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
205 "
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
206 (let* ((res (cl-transform-lambda (cons args body) name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
207 (form (list* 'defun name (cdr res))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
208 (if (car res) (list 'progn (car res) form) form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
209
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
210 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
211 (defmacro defmacro* (name args &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
212 "(defmacro* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a macro.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
213 Like normal `defmacro', except ARGLIST allows full Common Lisp conventions,
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
214 and BODY is implicitly surrounded by (block NAME ...).
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
215
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
216 \"Full Common Lisp conventions\" means that:
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
217
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
218 -- The lambda-list keywords &optional, &rest, &key, &allow-other-keys, and
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
219 &aux are allowed, as in `defun*'.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
220
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
221 -- Three additional lambda-list keywords are allowed: &body, &whole, and
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
222 &environment. #### Document me.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
223
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
224 -- The macro arg list syntax allows for \"destructuring\" -- see also
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
225 `destructuring-bind', which destructures exactly like `defmacro*', and
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
226 `loop', which does a rather different way of destructuring. Anywhere
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
227 that a simple argument may appear, and (if following a lambda-list
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
228 keyword) a list may not normally appear, an embedded lambda list can be
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
229 substituted. (The format of the embedded lambda list is exactly the
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
230 same as for a top-level list except that &environment is not allowed.)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
231 When matching this lambda list against a caller-specified argument, that
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
232 argument is treated as a list and normal lambda-list processing occurs,
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
233 just as if the entire operation were happening at top level.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
234 Furthermore, any lambda list, embedded or top-level, can be dotted at its
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
235 end, and this will cause matching with an appropriate dotted list given
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
236 as an argument.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
237
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
238 See `loop' for practical examples of destructuring, but
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
239 keep in mind that `loop' destructuring is somewhat different from macro
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
240 destructuring in that
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
241
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
242 (a) Macro destructuring has extra features in the various lambda-list
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
243 keywords, allowing for special processing of a list other than just
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
244 simple matching.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
245 (b) Macro destructuring is strict, in that an error is signalled if the
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
246 actual structure does not match the expected structure. On the
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
247 other hand, loop destructuring is lax -- extra arguments in a list
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
248 are ignored, not enough arguments cause the remaining parameters to
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
249 receive a value of nil, etc.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
250 "
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
251 (let* ((res (cl-transform-lambda (cons args body) name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
252 (form (list* 'defmacro name (cdr res))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
253 (if (car res) (list 'progn (car res) form) form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
254
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
255 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
256 (defmacro function* (func)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
257 "(function* SYMBOL-OR-LAMBDA): introduce a function.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
258 Like normal `function', except that if argument is a lambda form, its
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
259 ARGLIST allows full Common Lisp conventions."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
260 (if (eq (car-safe func) 'lambda)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
261 (let* ((res (cl-transform-lambda (cdr func) 'cl-none))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
262 (form (list 'function (cons 'lambda (cdr res)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
263 (if (car res) (list 'progn (car res) form) form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
264 (list 'function func)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
265
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
266 (defun cl-transform-function-property (func prop form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
267 (let ((res (cl-transform-lambda form func)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
268 (append '(progn) (cdr (cdr (car res)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
269 (list (list 'put (list 'quote func) (list 'quote prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
270 (list 'function (cons 'lambda (cdr res))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
271
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
272 (defconst lambda-list-keywords
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
273 '(&optional &rest &key &allow-other-keys &aux &whole &body &environment))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
274
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
275 (defvar cl-macro-environment nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
276 (defvar bind-block) (defvar bind-defs) (defvar bind-enquote)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
277 (defvar bind-inits) (defvar bind-lets) (defvar bind-forms)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
278
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
279 ;; npak@ispras.ru
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
280 (defun cl-upcase-arg (arg)
1580
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
281 ;; Changes all non-keyword symbols in `ARG' to symbols
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
282 ;; with name in upper case.
1580
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
283 ;; ARG is either symbol or list of symbols or lists
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
284 (cond ((symbolp arg)
1580
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
285 ;; Do not upcase &optional, &key etc.
4694
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
286 (if (memq arg lambda-list-keywords)
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
287 arg
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
288 (make-symbol (upcase (symbol-name arg)))))
1580
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
289 ((listp arg)
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
290 (let ((arg (copy-list arg)) junk)
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
291 ;; Clean the list
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
292 (let ((p (last arg))) (if (cdr p) (setcdr p (list '&rest (cdr p)))))
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
293 (if (setq junk (cadr (memq '&cl-defs arg)))
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
294 (setq arg (delq '&cl-defs (delq junk arg))))
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
295 (if (memq '&cl-quote arg)
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
296 (setq arg (delq '&cl-quote arg)))
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
297 (mapcar 'cl-upcase-arg arg)))
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
298 (t arg))) ; Maybe we are in initializer
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
299
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
300 ;; npak@ispras.ru
4702
eb1a409c317b Unbreak autoload.el
Mike Sperber <sperber@deinprogramm.de>
parents: 4695
diff changeset
301 ;;;###autoload
1580
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
302 (defun cl-function-arglist (name arglist)
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
303 "Returns string with printed representation of arguments list.
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
304 Supports Common Lisp lambda lists."
1580
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
305 (if (not (or (listp arglist) (symbolp arglist)))
15a9361e2781 [xemacs-hg @ 2003-07-18 20:39:44 by james]
james
parents: 1346
diff changeset
306 "Not available"
4694
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
307 (check-argument-type #'true-list-p arglist)
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
308 (let ((print-gensym nil))
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
309 (condition-case nil
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
310 (prin1-to-string
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
311 (cons (if (eq name 'cl-none) 'lambda name)
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
312 (cond ((null arglist) nil)
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
313 ((listp arglist) (cl-upcase-arg arglist))
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
314 ((symbolp arglist)
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
315 (cl-upcase-arg (list '&rest arglist)))
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
316 (t (wrong-type-argument 'listp arglist)))))
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
317 (t "Not available")))))
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
318
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
319 (defun cl-transform-lambda (form bind-block)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
320 (let* ((args (car form)) (body (cdr form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
321 (bind-defs nil) (bind-enquote nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
322 (bind-inits nil) (bind-lets nil) (bind-forms nil)
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
323 (header nil) (simple-args nil)
4694
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
324 (complex-arglist (cl-function-arglist bind-block args))
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 446
diff changeset
325 (doc ""))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
326 (while (or (stringp (car body)) (eq (car-safe (car body)) 'interactive))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
327 (push (pop body) header))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
328 (setq args (if (listp args) (copy-list args) (list '&rest args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
329 (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
330 (if (setq bind-defs (cadr (memq '&cl-defs args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
331 (setq args (delq '&cl-defs (delq bind-defs args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
332 bind-defs (cadr bind-defs)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
333 (if (setq bind-enquote (memq '&cl-quote args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
334 (setq args (delq '&cl-quote args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
335 (if (memq '&whole args) (error "&whole not currently implemented"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
336 (let* ((p (memq '&environment args)) (v (cadr p)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
337 (if p (setq args (nconc (delq (car p) (delq v args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
338 (list '&aux (list v 'cl-macro-environment))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
339 (while (and args (symbolp (car args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
340 (not (memq (car args) '(nil &rest &body &key &aux)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
341 (not (and (eq (car args) '&optional)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
342 (or bind-defs (consp (cadr args))))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
343 (push (pop args) simple-args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
344 (or (eq bind-block 'cl-none)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
345 (setq body (list (list* 'block bind-block body))))
4694
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
346 (setq simple-args (nreverse simple-args)
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
347 header (nreverse header))
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
348 ;; Add CL lambda list to documentation, if the CL lambda list differs
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
349 ;; from the non-CL lambda list. npak@ispras.ru
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
350 (unless (equal complex-arglist
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
351 (cl-function-arglist bind-block simple-args))
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
352 (and (stringp (car header)) (setq doc (pop header)))
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
353 (push (concat doc
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
354 "\n\nCommon Lisp lambda list:\n"
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
355 " " complex-arglist "\n\n")
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
356 header))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
357 (if (null args)
4694
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
358 (list* nil simple-args (nconc header body))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
359 (if (memq '&optional simple-args) (push '&optional args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
360 (cl-do-arglist args nil (- (length simple-args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
361 (if (memq '&optional simple-args) 1 0)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
362 (setq bind-lets (nreverse bind-lets))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
363 (list* (and bind-inits (list* 'eval-when '(compile load eval)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
364 (nreverse bind-inits)))
4694
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
365 (nconc simple-args
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
366 (list '&rest (car (pop bind-lets))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
367 ;; XEmacs change: we add usage information using Nickolay's
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
368 ;; approach above
4694
2ac296807b88 Don't needlessly intern symbols, #'function-arglist, #'cl-function-arglist
Aidan Kehoe <kehoea@parhasard.net>
parents: 4677
diff changeset
369 (nconc header
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
370 (list (nconc (list 'let* bind-lets)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
371 (nreverse bind-forms) body)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
372
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
373 (defun cl-do-arglist (args expr &optional num) ; uses bind-*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
374 (if (nlistp args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
375 (if (or (memq args lambda-list-keywords) (not (symbolp args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
376 (error "Invalid argument name: %s" args)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
377 (push (list args expr) bind-lets))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
378 (setq args (copy-list args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
379 (let ((p (last args))) (if (cdr p) (setcdr p (list '&rest (cdr p)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
380 (let ((p (memq '&body args))) (if p (setcar p '&rest)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
381 (if (memq '&environment args) (error "&environment used incorrectly"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
382 (let ((save-args args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
383 (restarg (memq '&rest args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
384 (safety (if (cl-compiling-file) cl-optimize-safety 3))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
385 (keys nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
386 (laterarg nil) (exactarg nil) minarg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
387 (or num (setq num 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
388 (if (listp (cadr restarg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
389 (setq restarg (gensym "--rest--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
390 (setq restarg (cadr restarg)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
391 (push (list restarg expr) bind-lets)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
392 (if (eq (car args) '&whole)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
393 (push (list (cl-pop2 args) restarg) bind-lets))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
394 (let ((p args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
395 (setq minarg restarg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
396 (while (and p (not (memq (car p) lambda-list-keywords)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
397 (or (eq p args) (setq minarg (list 'cdr minarg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
398 (setq p (cdr p)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
399 (if (memq (car p) '(nil &aux))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
400 (setq minarg (list '= (list 'length restarg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
401 (length (ldiff args p)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
402 exactarg (not (eq args p)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
403 (while (and args (not (memq (car args) lambda-list-keywords)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
404 (let ((poparg (list (if (or (cdr args) (not exactarg)) 'pop 'car)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
405 restarg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
406 (cl-do-arglist
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
407 (pop args)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
408 (if (or laterarg (= safety 0)) poparg
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
409 (list 'if minarg poparg
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
410 (list 'signal '(quote wrong-number-of-arguments)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
411 (list 'list (and (not (eq bind-block 'cl-none))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
412 (list 'quote bind-block))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
413 (list 'length restarg)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
414 (setq num (1+ num) laterarg t))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
415 (while (and (eq (car args) '&optional) (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
416 (while (and args (not (memq (car args) lambda-list-keywords)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
417 (let ((arg (pop args)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
418 (or (consp arg) (setq arg (list arg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
419 (if (cddr arg) (cl-do-arglist (nth 2 arg) (list 'and restarg t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
420 (let ((def (if (cdr arg) (nth 1 arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
421 (or (car bind-defs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
422 (nth 1 (assq (car arg) bind-defs)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
423 (poparg (list 'pop restarg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
424 (and def bind-enquote (setq def (list 'quote def)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
425 (cl-do-arglist (car arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
426 (if def (list 'if restarg poparg def) poparg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
427 (setq num (1+ num))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
428 (if (eq (car args) '&rest)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
429 (let ((arg (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
430 (if (consp arg) (cl-do-arglist arg restarg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
431 (or (eq (car args) '&key) (= safety 0) exactarg
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
432 (push (list 'if restarg
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
433 (list 'signal '(quote wrong-number-of-arguments)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
434 (list 'list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
435 (and (not (eq bind-block 'cl-none))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
436 (list 'quote bind-block))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
437 (list '+ num (list 'length restarg)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
438 bind-forms)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
439 (while (and (eq (car args) '&key) (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
440 (while (and args (not (memq (car args) lambda-list-keywords)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
441 (let ((arg (pop args)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
442 (or (consp arg) (setq arg (list arg)))
4793
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
443 (let* ((karg (if (consp (car arg))
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
444 ;; It's possible to use non-keywords here, as
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
445 ;; in the KEYWORD-ARGUMENT-NAME-PACKAGE Common
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
446 ;; Lisp issue:
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
447 (caar arg)
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
448 ;; Use read instead of intern in case we ever
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
449 ;; actually get packages and keywords are no
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
450 ;; longer in obarray:
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
451 (read (concat ":" (symbol-name (car arg))))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
452 (varg (if (consp (car arg)) (cadar arg) (car arg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
453 (def (if (cdr arg) (cadr arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
454 (or (car bind-defs) (cadr (assq varg bind-defs)))))
4793
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
455 (look (list 'memq (quote-maybe karg) restarg)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
456 (and def bind-enquote (setq def (list 'quote def)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
457 (if (cddr arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
458 (let* ((temp (or (nth 2 arg) (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
459 (val (list 'car (list 'cdr temp))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
460 (cl-do-arglist temp look)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
461 (cl-do-arglist varg
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
462 (list 'if temp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
463 (list 'prog1 val (list 'setq temp t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
464 def)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
465 (cl-do-arglist
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
466 varg
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
467 (list 'car
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
468 (list 'cdr
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
469 (if (null def)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
470 look
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
471 (list 'or look
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
472 (if (eq (cl-const-expr-p def) t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
473 (list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
474 'quote
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
475 (list nil (cl-const-expr-val def)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
476 (list 'list nil def))))))))
4793
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
477 (push karg keys)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
478 (setq keys (nreverse keys))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
479 (or (and (eq (car args) '&allow-other-keys) (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
480 (null keys) (= safety 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
481 (let* ((var (gensym "--keys--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
482 (allow '(:allow-other-keys))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
483 (check (list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
484 'while var
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
485 (list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
486 'cond
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
487 (list (list 'memq (list 'car var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
488 (list 'quote (append keys allow)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
489 (list 'setq var (list 'cdr (list 'cdr var))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
490 (list (list 'car
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
491 (list 'cdr
4793
8b50bee3c88c Remove attempted support for 1996-era emacs without self-quoting keywords.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
492 (list 'memq (car allow)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
493 restarg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
494 (list 'setq var nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
495 (list t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
496 (list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
497 'error
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
498 (format "Keyword argument %%s not one of %s"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
499 keys)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
500 (list 'car var)))))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
501 (push (list 'let (list (list var restarg)) check) bind-forms)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
502 (while (and (eq (car args) '&aux) (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
503 (while (and args (not (memq (car args) lambda-list-keywords)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
504 (if (consp (car args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
505 (if (and bind-enquote (cadar args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
506 (cl-do-arglist (caar args)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
507 (list 'quote (cadr (pop args))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
508 (cl-do-arglist (caar args) (cadr (pop args))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
509 (cl-do-arglist (pop args) nil))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
510 (if args (error "Malformed argument list %s" save-args)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
511
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
512 (defun cl-arglist-args (args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
513 (if (nlistp args) (list args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
514 (let ((res nil) (kind nil) arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
515 (while (consp args)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
516 (setq arg (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
517 (if (memq arg lambda-list-keywords) (setq kind arg)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
518 (if (eq arg '&cl-defs) (pop args)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
519 (and (consp arg) kind (setq arg (car arg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
520 (and (consp arg) (cdr arg) (eq kind '&key) (setq arg (cadr arg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
521 (setq res (nconc res (cl-arglist-args arg))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
522 (nconc res (and args (list args))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
523
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
524 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
525 (defmacro destructuring-bind (args expr &rest body)
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
526 "Bind the arguments in ARGS to EXPR then eval BODY.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
527 This is similar to `let' but it does \"destructuring\", in that it matches
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
528 the structure of ARGS to the structure of EXPR and binds corresponding
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
529 arguments in ARGS to their values in EXPR. The format of ARGS, and the
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
530 way the destructuring works, is exactly like the destructuring that occurs
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
531 in `defmacro*'; see that for more information.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
532
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
533 An alternative means of destructuring is using the `loop' macro. `loop'
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
534 gives practical examples of destructuring. `defmacro*' describes the
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
535 differences between loop and macro-style destructuring.
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
536
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
537 You can rewrite a call to (destructuring-bind ARGS EXPR &rest BODY) using
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
538 `loop', approximately like this:
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
539
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
540 (loop for ARGS = EXPR
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
541 return (progn BODY))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
542
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
543 I say \"approximately\" because the destructuring works in a somewhat
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
544 different fashion, although for most reasonably simple constructs the
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 800
diff changeset
545 results will be the same."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
546 (let* ((bind-lets nil) (bind-forms nil) (bind-inits nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
547 (bind-defs nil) (bind-block 'cl-none))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
548 (cl-do-arglist (or args '(&aux)) expr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
549 (append '(progn) bind-inits
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
550 (list (nconc (list 'let* (nreverse bind-lets))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
551 (nreverse bind-forms) body)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
552
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
553
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
554 ;;; The `eval-when' form.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
555
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
556 (defvar cl-not-toplevel nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
557
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
558 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
559 (defmacro eval-when (when &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
560 "(eval-when (WHEN...) BODY...): control when BODY is evaluated.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
561 If `compile' is in WHEN, BODY is evaluated when compiled at top-level.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
562 If `load' is in WHEN, BODY is evaluated when loaded after top-level compile.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
563 If `eval' is in WHEN, BODY is evaluated when interpreted or at non-top-level."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
564 (if (and (fboundp 'cl-compiling-file) (cl-compiling-file)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
565 (not cl-not-toplevel) (not (boundp 'for-effect))) ; horrible kludge
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
566 (let ((comp (or (memq 'compile when) (memq :compile-toplevel when)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
567 (cl-not-toplevel t))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
568 (if (or (memq 'load when) (memq :load-toplevel when))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
569 (if comp (cons 'progn (mapcar 'cl-compile-time-too body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
570 (list* 'if nil nil body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
571 (progn (if comp (eval (cons 'progn body))) nil)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
572 (and (or (memq 'eval when) (memq :execute when))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
573 (cons 'progn body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
574
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
575 (defun cl-compile-time-too (form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
576 (or (and (symbolp (car-safe form)) (get (car-safe form) 'byte-hunk-handler))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
577 (setq form (macroexpand
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
578 form (cons '(eval-when) byte-compile-macro-environment))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
579 (cond ((eq (car-safe form) 'progn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
580 (cons 'progn (mapcar 'cl-compile-time-too (cdr form))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
581 ((eq (car-safe form) 'eval-when)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
582 (let ((when (nth 1 form)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
583 (if (or (memq 'eval when) (memq :execute when))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
584 (list* 'eval-when (cons 'compile when) (cddr form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
585 form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
586 (t (eval form) form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
587
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
588 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
589 (defmacro load-time-value (form &optional read-only)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
590 "Like `progn', but evaluates the body at load time.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
591 The result of the body appears to the compiler as a quoted constant."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
592 (if (cl-compiling-file)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
593 (let* ((temp (gentemp "--cl-load-time--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
594 (set (list 'set (list 'quote temp) form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
595 (if (and (fboundp 'byte-compile-file-form-defmumble)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
596 (boundp 'this-kind) (boundp 'that-one))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
597 (fset 'byte-compile-file-form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
598 (list 'lambda '(form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
599 (list 'fset '(quote byte-compile-file-form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
600 (list 'quote
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
601 (symbol-function 'byte-compile-file-form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
602 (list 'byte-compile-file-form (list 'quote set))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
603 '(byte-compile-file-form form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
604 ;; XEmacs change
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
605 (print set (symbol-value ;;'outbuffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
606 'byte-compile-output-buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
607 )))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
608 (list 'symbol-value (list 'quote temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
609 (list 'quote (eval form))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
610
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
611
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
612 ;;; Conditional control structures.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
613
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
614 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
615 (defmacro case (expr &rest clauses)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
616 "Evals EXPR, chooses from CLAUSES on that value.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
617 Each clause looks like (KEYLIST BODY...). EXPR is evaluated and compared
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
618 against each key in each KEYLIST; the corresponding BODY is evaluated.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
619 If no clause succeeds, case returns nil. A single atom may be used in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
620 place of a KEYLIST of one atom. A KEYLIST of `t' or `otherwise' is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
621 allowed only in the final clause, and matches if no other keys match.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
622 Key values are compared by `eql'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
623 (let* ((temp (if (cl-simple-expr-p expr 3) expr (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
624 (head-list nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
625 (last-clause (car (last clauses)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
626 (body (cons
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
627 'cond
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
628 (mapcar
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
629 #'(lambda (c)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
630 (cons (cond ((memq (car c) '(t otherwise))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
631 ;; XEmacs addition: check for last clause
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
632 (or (eq c last-clause)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
633 (error
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
634 "`%s' is allowed only as the last case clause"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
635 (car c)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
636 t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
637 ((eq (car c) 'ecase-error-flag)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
638 (list 'error "ecase failed: %s, %s"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
639 temp (list 'quote (reverse head-list))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
640 ((listp (car c))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
641 (setq head-list (append (car c) head-list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
642 (list 'member* temp (list 'quote (car c))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
643 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
644 (if (memq (car c) head-list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
645 (error "Duplicate key in case: %s"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
646 (car c)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
647 (push (car c) head-list)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
648 (list 'eql temp (list 'quote (car c)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
649 (or (cdr c) '(nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
650 clauses))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
651 (if (eq temp expr) body
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
652 (list 'let (list (list temp expr)) body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
653
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
654 ;; #### CL standard also requires `ccase', which signals a continuable
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
655 ;; error (`cerror' in XEmacs). However, I don't think it buys us
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
656 ;; anything to introduce it, as there is probably much more CL stuff
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
657 ;; missing, and the feature is not essential. --hniksic
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
658
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
659 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
660 (defmacro ecase (expr &rest clauses)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
661 "Like `case', but error if no case fits.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
662 `otherwise'-clauses are not allowed."
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
663 ;; XEmacs addition: disallow t and otherwise
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
664 (let ((disallowed (or (assq t clauses)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
665 (assq 'otherwise clauses))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
666 (if disallowed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
667 (error "`%s' is not allowed in ecase" (car disallowed))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
668 (list* 'case expr (append clauses '((ecase-error-flag)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
669
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
670 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
671 (defmacro typecase (expr &rest clauses)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
672 "Evals EXPR, chooses from CLAUSES on that value.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
673 Each clause looks like (TYPE BODY...). EXPR is evaluated and, if it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
674 satisfies TYPE, the corresponding BODY is evaluated. If no clause succeeds,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
675 typecase returns nil. A TYPE of `t' or `otherwise' is allowed only in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
676 final clause, and matches if no other keys match."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
677 (let* ((temp (if (cl-simple-expr-p expr 3) expr (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
678 (type-list nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
679 (body (cons
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
680 'cond
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
681 (mapcar
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
682 #'(lambda (c)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
683 (cons (cond ((eq (car c) 'otherwise) t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
684 ((eq (car c) 'ecase-error-flag)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
685 (list 'error "etypecase failed: %s, %s"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
686 temp (list 'quote (reverse type-list))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
687 (t
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
688 (push (car c) type-list)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
689 (cl-make-type-test temp (car c))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
690 (or (cdr c) '(nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
691 clauses))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
692 (if (eq temp expr) body
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
693 (list 'let (list (list temp expr)) body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
694
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
695 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
696 (defmacro etypecase (expr &rest clauses)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
697 "Like `typecase', but error if no case fits.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
698 `otherwise'-clauses are not allowed."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
699 (list* 'typecase expr (append clauses '((ecase-error-flag)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
700
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
701
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
702 ;;; Blocks and exits.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
703
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
704 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
705 (defmacro block (name &rest body)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
706 "Define a lexically-scoped block named NAME.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
707 NAME may be any symbol. Code inside the BODY forms can call `return-from'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
708 to jump prematurely out of the block. This differs from `catch' and `throw'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
709 in two respects: First, the NAME is an unevaluated symbol rather than a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
710 quoted symbol or other form; and second, NAME is lexically rather than
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
711 dynamically scoped: Only references to it within BODY will work. These
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
712 references may appear inside macro expansions, but not inside functions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
713 called from BODY."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
714 (if (cl-safe-expr-p (cons 'progn body)) (cons 'progn body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
715 (list 'cl-block-wrapper
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
716 (list* 'catch (list 'quote (intern (format "--cl-block-%s--" name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
717 body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
718
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
719 (defvar cl-active-block-names nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
720
4677
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
721 (put 'cl-block-wrapper 'byte-compile
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
722 #'(lambda (cl-form)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
723 (if (/= (length cl-form) 2)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
724 (byte-compile-warn-wrong-args cl-form 1))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
725
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
726 (if (fboundp 'byte-compile-form-do-effect) ; Check for optimizing
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
727 ; compiler
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
728 (progn
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
729 (let* ((cl-entry (cons (nth 1 (nth 1 (nth 1 cl-form))) nil))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
730 (cl-active-block-names (cons cl-entry
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
731 cl-active-block-names))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
732 (cl-body (byte-compile-top-level
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
733 (cons 'progn (cddr (nth 1 cl-form))))))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
734 (if (cdr cl-entry)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
735 (byte-compile-form (list 'catch (nth 1 (nth 1 cl-form))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
736 cl-body))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
737 (byte-compile-form cl-body))))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
738 (byte-compile-form (nth 1 cl-form)))))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
739
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
740 (put 'cl-block-throw 'byte-compile
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
741 #'(lambda (cl-form)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
742 (let ((cl-found (assq (nth 1 (nth 1 cl-form)) cl-active-block-names)))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
743 (if cl-found (setcdr cl-found t)))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
744 (byte-compile-throw (cons 'throw (cdr cl-form)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
745
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
746 ;;;###autoload
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
747 (defmacro return (&optional result)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
748 "Return from the block named nil.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
749 This is equivalent to `(return-from nil RESULT)'."
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
750 (list 'return-from nil result))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
751
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
752 ;;;###autoload
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
753 (defmacro return-from (name &optional result)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
754 "Return from the block named NAME.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
755 This jumps out to the innermost enclosing `(block NAME ...)' form,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
756 returning RESULT from that form (or nil if RESULT is omitted).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
757 This is compatible with Common Lisp, but note that `defun' and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
758 `defmacro' do not create implicit blocks as they do in Common Lisp."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
759 (let ((name2 (intern (format "--cl-block-%s--" name))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
760 (list 'cl-block-throw (list 'quote name2) result)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
761
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
762
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
763 ;;; The "loop" macro.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
764
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
765 (defvar args) (defvar loop-accum-var) (defvar loop-accum-vars)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
766 (defvar loop-bindings) (defvar loop-body) (defvar loop-destr-temps)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
767 (defvar loop-finally) (defvar loop-finish-flag) (defvar loop-first-flag)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
768 (defvar loop-initially) (defvar loop-map-form) (defvar loop-name)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
769 (defvar loop-result) (defvar loop-result-explicit)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
770 (defvar loop-result-var) (defvar loop-steps) (defvar loop-symbol-macs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
771
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
772 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
773 (defmacro loop (&rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
774 "(loop CLAUSE...): The Common Lisp `loop' macro.
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
775
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
776 The loop macro consists of a series of clauses, which do things like
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
777 iterate variables, set conditions for exiting the loop, accumulating values
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
778 to be returned as the return value of the loop, and executing arbitrary
2297
13a418960a88 [xemacs-hg @ 2004-09-22 02:05:42 by stephent]
stephent
parents: 2153
diff changeset
779 blocks of code. Each clause is processed in turn, and the loop executes its
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
780 body repeatedly until an exit condition is hit.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
781
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
782 It's important to understand that loop clauses such as `for' and `while',
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
783 which look like loop-establishing constructs, don't actually *establish* a
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
784 loop\; the looping is established by the `loop' clause itself, which will
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
785 repeatedly process its body until told to stop. `while' merely establishes
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
786 a condition which, when true, causes the loop to finish, and `for' sets a
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
787 variable to different values on each iteration (e.g. successive elements of
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
788 a list) and sets an exit condition when there are no more values. This
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
789 means, for example, that if two `for' clauses appear, you don't get two
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
790 nested loops, but instead two variables that are stepped in parallel, and
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
791 two exit conditions, either of which, if triggered, will cause the loop to
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
792 end. Similarly for a loop with a `for' and a `while' clause. For example:
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
793
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
794 \(loop
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
795 for x in list
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
796 while x
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
797 do ...)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
798
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
799 In each successive iteration, X is set to the next element of the list. If
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
800 there are no more elements, or if any element is nil (the `while' clause),
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
801 the loop exits. Otherwise, the block of code following `do' is executed.)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
802
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
803 This example also shows that some clauses establish variable bindings --
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
804 essentially like a `let' binding -- and that following clauses can
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
805 reference these variables. Furthermore, the entire loop is surrounded by a
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
806 block named nil (unless the `named' clause is given), so you can return
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
807 from the loop using the macro `return'. (The other way to exit the loop is
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
808 through the macro `loop-finish'. The difference is that some loop clauses
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
809 establish or accumulate a value to be returned, and `loop-finish' returns
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
810 this. `return', however, can only return an explicitly-specified value.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
811 NOTE CAREFULLY: There is a loop clause called `return' as well as a
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
812 standard Lisp macro called `return'. Normally they work similarly\; but if
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
813 you give the loop a name with `named', you will need to use the macro
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
814 `return-from'.)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
815
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
816 Another extremely useful feature of loops is called \"destructuring\". If,
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
817 in place of VAR, a list (possibly dotted, possibly a tree of arbitary
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
818 complexity) is given, the value to be assigned is assumed to have a similar
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
819 structure to the list given, and variables in the list will be matched up
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
820 with corresponding elements in the structure. For example:
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
821
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
822 \(loop
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
823 for (x y) in '((foo 1) (bar 2) (baz 3))
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
824 do (puthash x y some-hash-table))
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
825
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
826 will add three elements to a hash table, mapping foo -> 1, bar -> 2, and
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
827 baz -> 3. As other examples, you can conveniently process alists using
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
828
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
829 \(loop for (x . y) in alist do ...)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
830
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
831 and plists using
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
832
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
833 \(loop for (x y) on plist by #'cddr do ...)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
834
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
835 Destructuring is forgiving in that mismatches in the number of elements on
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
836 either size will be handled gracefully, either by ignoring or initializing
1123
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
837 to nil. Destructuring is extremely powerful, and is probably the single
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
838 most useful feature of `loop'.
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
839
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
840 Other useful features of loops are iterating over hash-tables, collecting values into lists, and being able to modify lists in-place as you iterate over them. As an example of the first two,
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
841
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
842 \(loop for x being the hash-key in table using (hash-value y)
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
843 collect (cons x y))
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
844
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
845 converts hash-table TABLE to an alist. (What `collect' actually does is
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
846 push its value onto the end of an internal list and establish this list as
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
847 the default return value of the loop. See below for more information.)
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
848
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
849 An example of in-place modification is
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
850
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
851 \(setq foo '(1 3 5))
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
852 \(loop for x in-ref foo do
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
853 (setf x (* x x)))
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
854
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 872
diff changeset
855 after which foo will contain '(1 9 25).
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
856
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
857 If you don't understand how a particular loop clause works, create an
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
858 example and use `macroexpand-sexp' to expand the macro.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
859
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
860 Valid clauses are:
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
861
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
862 \(NOTE: Keywords in lowercase\; slashes separate different possibilities
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
863 for keywords, some of which are synonymous\; brackets indicate optional
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
864 parts of the clause. In all of the clauses with `being', the word `being',
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
865 the words `each' or `the', and the difference between singular and plural
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
866 keywords are all just syntactic sugar. Stylistically, you should write
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
867 either `being each foo' or `being the foos'.)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
868
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
869 for VAR from/upfrom/downfrom NUM1 to/upto/downto/above/below NUM2 [by NUMSTEP]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
870 Step VAR across numbers. `upfrom', `upto', and `below' explicitly
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
871 indicate upward stepping\; `downfrom', `downto', and `above' explicitly
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
872 indicate downward stepping. (If none of these is given, the default is
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
873 upward.) `to', `upto', and `downto' cause stepping to include NUM2 as
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
874 the last iteration, while `above' and `below' stop just before reaching
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
875 NUM2. `by' can be given to indicate a stepping increment other than 1.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
876
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
877 for VAR in LIST [by FUNC]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
878 Step VAR over elements of a LIST. FUNC specifies how to get successive
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
879 sublists and defaults to `cdr'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
880
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
881 for VAR on LIST [by FUNC]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
882 Step VAR over tails of a LIST. FUNC specifies how to get successive
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
883 sublists and defaults to `cdr'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
884
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
885 for VAR in-ref LIST [by FUNC]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
886 Step VAR over elements of a LIST, like `for ... in', except the VAR is
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
887 bound using `symbol-macrolet' instead of `let'. In essence, VAR is set
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
888 to a \"reference\" to the list element instead of the element itself\;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
889 this us, you can destructively modify the list using `setf' on VAR, and
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
890 any changes to the list will \"magically\" reflect themselves in
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
891 subsequent uses of VAR.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
892
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
893 for VAR = INIT [then EXPR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
894 Set VAR on each iteration of the loop. If only INIT is given, use it
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
895 on each iteration. Otherwise, use INIT on the first iteration and EXPR
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
896 on subsequent ones.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
897
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
898 for VAR across/across-ref ARRAY
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
899 Step VAR across a sequence other than a list (string, vector, bit
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
900 vector). If `across-ref' is given, VAR is bound using
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
901 `symbol-macrolet' instead of `let' -- see above.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
902
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
903 for VAR being each/the element/elements in/of/in-ref/of-ref SEQUENCE [using (index INDEX-VAR)]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
904 Step VAR across any sequence. A variable can be specified with a
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
905 `using' phrase to receive the index, starting at 0. If `in-ref' or
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
906 `of-ref' is given, VAR is bound using `symbol-macrolet' instead of
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
907 `let' -- see above.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
908
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
909 for VAR being each/the hash-key/hash-keys/hash-value/hash-values in/of HASH-TABLE [using (hash-value/hash-key OTHER-VAR)]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
910
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
911 for VAR being each/the hash-key/hash-keys/hash-value/hash-values in/of HASH-TABLE [using (hash-value/hash-key OTHER-VAR)]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
912 Map VAR over a hash table. The various keywords are synonymous except
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
913 those that distinguish between keys and values. The `using' phrase is
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
914 optional and allows both key and value to be bound.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
915
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
916 for VAR being each/the symbol/present-symbol/external-symbol/symbols/present-symbols/external-symbols in/of OBARRAY
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
917 Map VAR over the symbols in an obarray. All symbol keywords are
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
918 currently synonymous.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
919
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
920 for VAR being each/the extent/extents [in/of BUFFER-OR-STRING] [from POS] [to POS]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
921 Map VAR over the extents in a buffer or string, defaulting to the
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
922 current buffer, the beginning and the end, respectively.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
923
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
924 for VAR being each/the interval/intervals [in/of BUFFER-OR-STRING] [property PROPERTY] [from POS] [to POS]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
925 Map VAR over the intervals without property change in a buffer or
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
926 string, defaulting to the current buffer, the beginning and the end,
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
927 respectively. If PROPERTY is given, iteration occurs using
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
928 `next-single-property-change'\; otherwise, using
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
929 `next-property-change'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
930
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
931 for VAR being each/the window/windows [in/of FRAME]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
932 Step VAR over the windows in FRAME, defaulting to the selected frame.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
933
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
934 for VAR being each/the frame/frames
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
935 Step VAR over all frames.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
936
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
937 for VAR being each/the buffer/buffers [by FUNC]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
938 Step VAR over all buffers. This is actually equivalent to
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
939 `for VAR in (buffer-list) [by FUNC]'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
940
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
941 for VAR being each/the key-code/key-codes/key-seq/key-seqs/key-binding/key-bindings in KEYMAP [using (key-code/key-codes/key-seq/key-seqs/key-binding/key-bindings OTHER-VAR)]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
942 Map VAR over the entries in a keymap. Keyword `key-seq' causes
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
943 recursive mapping over prefix keymaps occurring in the keymap, with VAR
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
944 getting the built-up sequence (a vector). Otherwise, mapping does not
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
945 occur recursively. `key-code' and `key-seq' refer to what is bound
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
946 (second argument of `define-key'), and `key-binding' what it's bound to
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
947 (third argument of `define-key').
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
948
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
949 as VAR ...
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
950 `as' is a synonym for `for'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
951
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
952 and VAR ...
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
953 `and' clauses have the same syntax as `for' clauses except that the
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
954 variables in the clause are bound in parallel with a preceding
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
955 `and'/`for' clause instead of in series.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
956
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
957 with VAR = INIT
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
958 Set VAR to INIT once, before doing any iterations.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
959
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
960 repeat NUM
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
961 Exit the loop if more than NUM iterations have occurred.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
962
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
963 while COND
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
964 Exit the loop if COND isn't true.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
965
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
966 until COND
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
967 Exit the loop if COND is true.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
968
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
969 collect EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
970 Push EXPR onto the end of a list of values -- stored either in VAR or a
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
971 temporary variable that will be returned as the return value of the
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
972 loop if it terminates through an exit condition or a call to
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
973 `loop-finish'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
974
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
975 append EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
976 Append EXPR (a list) onto the end of a list of values, like `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
977
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
978 nconc EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
979 Nconc EXPR (a list) onto the end of a list of values, like `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
980
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
981 concat EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
982 Concatenate EXPR (a string) onto the end of a string of values, like
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
983 `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
984
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
985 vconcat EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
986 Concatenate EXPR (a vector) onto the end of a vector of values, like
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
987 `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
988
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
989 bvconcat EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
990 Concatenate EXPR (a bit vector) onto the end of a bit vector of values,
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
991 like `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
992
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
993 sum EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
994 Add EXPR to a value, like `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
995
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
996 count EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
997 If EXPR is true, increment a value by 1, like `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
998
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
999 maximize EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1000 IF EXPR is greater than a value, replace the value with EXPR, like
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1001 `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1002
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1003 minimize EXPR [into VAR]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1004 IF EXPR is less than a value, replace the value with EXPR, like
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1005 `collect'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1006
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1007 always COND
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1008 If COND is true, continue the loop and set the loop return value (the
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1009 same value that's manipulated by `collect' and friends and is returned
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1010 by a normal loop exit or an exit using `loop-finish') to t\; otherwise,
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1011 exit the loop and return nil. The effect is to determine and return
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1012 whether a condition is true \"always\" (all iterations of the loop).
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1013
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1014 never COND
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1015 If COND is false, continue the loop and set the loop return value (like
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1016 `always') to t\; otherwise, exit the loop and return nil. The effect
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1017 is to determine and return whether a condition is \"never\" true (all
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1018 iterations of the loop).
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1019
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1020 thereis COND
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1021 If COND is true, exit the loop and return COND.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1022
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1023 if/when COND CLAUSE [and CLAUSE]... else CLAUSE [and CLAUSE...]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1024 If COND is true, execute the directly following clause(s)\; otherwise,
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1025 execute the clauses following `else'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1026
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1027 unless COND CLAUSE [and CLAUSE]... else CLAUSE [and CLAUSE...]
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1028 If COND is false, execute the directly following clause(s)\; otherwise, execute the clauses following `else'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1029
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1030 do EXPRS...
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1031 Execute the expressions (any Lisp forms).
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1032
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1033 initially EXPRS...
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1034 Execute EXPR once, before doing any iterations, and after values have
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1035 been set using `with'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1036
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1037 finally EXPRS...
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1038 Execute EXPR once, directly before the loop terminates. This will not
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1039 be executed if the loop terminates prematurely as a result of `always',
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1040 `never', `thereis', or `return'.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1041
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1042 return EXPR
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1043 Exit from the loop and return EXPR.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1044
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1045 finally return EXPR
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1046 Specify the value to be returned when the loop exits. (Unlike `return',
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1047 this doesn't cause the loop to immediately exit\; it will exit whenever
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1048 it normally would have.) This takes precedence over a return value
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1049 specified with `collect' and friends or `always' and friends.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1050
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1051 named NAME
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1052 Specify the name for block surrounding the loop, in place of nil.
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1053 (See `block'.)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1054 "
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1055 (if (not (memq t (mapcar 'symbolp (delq nil (delq t (copy-list args))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1056 (list 'block nil (list* 'while t args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1057 (let ((loop-name nil) (loop-bindings nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1058 (loop-body nil) (loop-steps nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1059 (loop-result nil) (loop-result-explicit nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1060 (loop-result-var nil) (loop-finish-flag nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1061 (loop-accum-var nil) (loop-accum-vars nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1062 (loop-initially nil) (loop-finally nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1063 (loop-map-form nil) (loop-first-flag nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1064 (loop-destr-temps nil) (loop-symbol-macs nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1065 (setq args (append args '(cl-end-loop)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1066 (while (not (eq (car args) 'cl-end-loop)) (cl-parse-loop-clause))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1067 (if loop-finish-flag
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1068 (push (list (list loop-finish-flag t)) loop-bindings))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1069 (if loop-first-flag
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1070 (progn (push (list (list loop-first-flag t)) loop-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1071 (push (list 'setq loop-first-flag nil) loop-steps)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1072 (let* ((epilogue (nconc (nreverse loop-finally)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1073 (list (or loop-result-explicit loop-result))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1074 (ands (cl-loop-build-ands (nreverse loop-body)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1075 (while-body (nconc (cadr ands) (nreverse loop-steps)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1076 (body (append
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1077 (nreverse loop-initially)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1078 (list (if loop-map-form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1079 (list 'block '--cl-finish--
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1080 (subst
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1081 (if (eq (car ands) t) while-body
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1082 (cons (list 'or (car ands)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1083 '(return-from --cl-finish--
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1084 nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1085 while-body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1086 '--cl-map loop-map-form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1087 (list* 'while (car ands) while-body)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1088 (if loop-finish-flag
1346
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1089 (if (equal epilogue '(nil))
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1090 ;; XEmacs change: When epilogue is nil and
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1091 ;; loop-finish-flag exists, you get a byte-compiler
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1092 ;; warning using the original (commented-out)
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1093 ;; code below. So instead we create a form that
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1094 ;; gives the same result but uses loop-finish-flag.
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1095 ;; --ben
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1096 ;(list loop-result-var)
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1097 (list (list 'if loop-finish-flag
01c57eb70ae9 [xemacs-hg @ 2003-03-09 02:27:27 by ben]
ben
parents: 1123
diff changeset
1098 loop-result-var loop-result-var))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1099 (list (list 'if loop-finish-flag
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1100 (cons 'progn epilogue) loop-result-var)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1101 epilogue))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1102 (if loop-result-var (push (list loop-result-var) loop-bindings))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1103 (while loop-bindings
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1104 (if (cdar loop-bindings)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1105 (setq body (list (cl-loop-let (pop loop-bindings) body t)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1106 (let ((lets nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1107 (while (and loop-bindings
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1108 (not (cdar loop-bindings)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1109 (push (car (pop loop-bindings)) lets))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1110 (setq body (list (cl-loop-let lets body nil))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1111 (if loop-symbol-macs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1112 (setq body (list (list* 'symbol-macrolet loop-symbol-macs body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1113 (list* 'block loop-name body)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1114
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1115 (defun cl-parse-loop-clause () ; uses args, loop-*
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1116 (let ((word (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1117 (hash-types '(hash-key hash-keys hash-value hash-values))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1118 (key-types '(key-code key-codes key-seq key-seqs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1119 key-binding key-bindings)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1120 (cond
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1121
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1122 ((null args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1123 (error "Malformed `loop' macro"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1124
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1125 ((eq word 'named)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1126 (setq loop-name (pop args)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1127
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1128 ((eq word 'initially)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1129 (if (memq (car args) '(do doing)) (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1130 (or (consp (car args)) (error "Syntax error on `initially' clause"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1131 (while (consp (car args))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1132 (push (pop args) loop-initially)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1133
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1134 ((eq word 'finally)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1135 (if (eq (car args) 'return)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1136 (setq loop-result-explicit (or (cl-pop2 args) '(quote nil)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1137 (if (memq (car args) '(do doing)) (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1138 (or (consp (car args)) (error "Syntax error on `finally' clause"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1139 (if (and (eq (caar args) 'return) (null loop-name))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1140 (setq loop-result-explicit (or (nth 1 (pop args)) '(quote nil)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1141 (while (consp (car args))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1142 (push (pop args) loop-finally)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1143
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1144 ((memq word '(for as))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1145 (let ((loop-for-bindings nil) (loop-for-sets nil) (loop-for-steps nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1146 (ands nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1147 (while
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1148 (let ((var (or (pop args) (gensym))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1149 (setq word (pop args))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1150 (if (eq word 'being) (setq word (pop args)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1151 (if (memq word '(the each)) (setq word (pop args)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1152 (if (memq word '(buffer buffers))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1153 (setq word 'in args (cons '(buffer-list) args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1154 (cond
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1155
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1156 ((memq word '(from downfrom upfrom to downto upto
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1157 above below by))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1158 (push word args)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1159 (if (memq (car args) '(downto above))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1160 (error "Must specify `from' value for downward loop"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1161 (let* ((down (or (eq (car args) 'downfrom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1162 (memq (caddr args) '(downto above))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1163 (excl (or (memq (car args) '(above below))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1164 (memq (caddr args) '(above below))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1165 (start (and (memq (car args) '(from upfrom downfrom))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1166 (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1167 (end (and (memq (car args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1168 '(to upto downto above below))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1169 (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1170 (step (and (eq (car args) 'by) (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1171 (end-var (and (not (cl-const-expr-p end)) (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1172 (step-var (and (not (cl-const-expr-p step))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1173 (gensym))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1174 (and step (numberp step) (<= step 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1175 (error "Loop `by' value is not positive: %s" step))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1176 (push (list var (or start 0)) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1177 (if end-var (push (list end-var end) loop-for-bindings))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1178 (if step-var (push (list step-var step)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1179 loop-for-bindings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1180 (if end
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1181 (push (list
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1182 (if down (if excl '> '>=) (if excl '< '<=))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1183 var (or end-var end)) loop-body))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1184 (push (list var (list (if down '- '+) var
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1185 (or step-var step 1)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1186 loop-for-steps)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1187
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1188 ((memq word '(in in-ref on))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1189 (let* ((on (eq word 'on))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1190 (temp (if (and on (symbolp var)) var (gensym))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1191 (push (list temp (pop args)) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1192 (push (list 'consp temp) loop-body)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1193 (if (eq word 'in-ref)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1194 (push (list var (list 'car temp)) loop-symbol-macs)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1195 (or (eq temp var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1196 (progn
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1197 (push (list var nil) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1198 (push (list var (if on temp (list 'car temp)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1199 loop-for-sets))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1200 (push (list temp
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1201 (if (eq (car args) 'by)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1202 (let ((step (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1203 (if (and (memq (car-safe step)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1204 '(quote function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1205 function*))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1206 (symbolp (nth 1 step)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1207 (list (nth 1 step) temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1208 (list 'funcall step temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1209 (list 'cdr temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1210 loop-for-steps)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1211
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1212 ((eq word '=)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1213 (let* ((start (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1214 (then (if (eq (car args) 'then) (cl-pop2 args) start)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1215 (push (list var nil) loop-for-bindings)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1216 (if (or ands (eq (car args) 'and))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1217 (progn
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1218 (push (list var
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1219 (list 'if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1220 (or loop-first-flag
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1221 (setq loop-first-flag
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1222 (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1223 start var))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1224 loop-for-sets)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1225 (push (list var then) loop-for-steps))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1226 (push (list var
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1227 (if (eq start then) start
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1228 (list 'if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1229 (or loop-first-flag
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1230 (setq loop-first-flag (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1231 start then)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1232 loop-for-sets))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1233
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1234 ((memq word '(across across-ref))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1235 (let ((temp-vec (gensym)) (temp-idx (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1236 (push (list temp-vec (pop args)) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1237 (push (list temp-idx -1) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1238 (push (list '< (list 'setq temp-idx (list '1+ temp-idx))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1239 (list 'length temp-vec)) loop-body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1240 (if (eq word 'across-ref)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1241 (push (list var (list 'aref temp-vec temp-idx))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1242 loop-symbol-macs)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1243 (push (list var nil) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1244 (push (list var (list 'aref temp-vec temp-idx))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1245 loop-for-sets))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1246
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1247 ((memq word '(element elements))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1248 (let ((ref (or (memq (car args) '(in-ref of-ref))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1249 (and (not (memq (car args) '(in of)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1250 (error "Expected `of'"))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1251 (seq (cl-pop2 args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1252 (temp-seq (gensym))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1253 (temp-idx (if (eq (car args) 'using)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1254 (if (and (= (length (cadr args)) 2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1255 (eq (caadr args) 'index))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1256 (cadr (cl-pop2 args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1257 (error "Bad `using' clause"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1258 (gensym))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1259 (push (list temp-seq seq) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1260 (push (list temp-idx 0) loop-for-bindings)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1261 (if ref
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1262 (let ((temp-len (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1263 (push (list temp-len (list 'length temp-seq))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1264 loop-for-bindings)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1265 (push (list var (list 'elt temp-seq temp-idx))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1266 loop-symbol-macs)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1267 (push (list '< temp-idx temp-len) loop-body))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1268 (push (list var nil) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1269 (push (list 'and temp-seq
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1270 (list 'or (list 'consp temp-seq)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1271 (list '< temp-idx
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1272 (list 'length temp-seq))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1273 loop-body)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1274 (push (list var (list 'if (list 'consp temp-seq)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1275 (list 'pop temp-seq)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1276 (list 'aref temp-seq temp-idx)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1277 loop-for-sets))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1278 (push (list temp-idx (list '1+ temp-idx))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1279 loop-for-steps)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1280
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1281 ((memq word hash-types)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1282 (or (memq (car args) '(in of)) (error "Expected `of'"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1283 (let* ((table (cl-pop2 args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1284 (other (if (eq (car args) 'using)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1285 (if (and (= (length (cadr args)) 2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1286 (memq (caadr args) hash-types)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1287 (not (eq (caadr args) word)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1288 (cadr (cl-pop2 args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1289 (error "Bad `using' clause"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1290 (gensym))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1291 (if (memq word '(hash-value hash-values))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1292 (setq var (prog1 other (setq other var))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1293 (setq loop-map-form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1294 (list 'maphash (list 'function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1295 (list* 'lambda (list var other)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1296 '--cl-map)) table))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1297
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1298 ((memq word '(symbol present-symbol external-symbol
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1299 symbols present-symbols external-symbols))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1300 (let ((ob (and (memq (car args) '(in of)) (cl-pop2 args))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1301 (setq loop-map-form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1302 (list 'mapatoms (list 'function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1303 (list* 'lambda (list var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1304 '--cl-map)) ob))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1305
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1306 ((memq word '(overlay overlays extent extents))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1307 (let ((buf nil) (from nil) (to nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1308 (while (memq (car args) '(in of from to))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1309 (cond ((eq (car args) 'from) (setq from (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1310 ((eq (car args) 'to) (setq to (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1311 (t (setq buf (cl-pop2 args)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1312 (setq loop-map-form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1313 (list 'cl-map-extents
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1314 (list 'function (list 'lambda (list var (gensym))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1315 '(progn . --cl-map) nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1316 buf from to))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1317
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1318 ((memq word '(interval intervals))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1319 (let ((buf nil) (prop nil) (from nil) (to nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1320 (var1 (gensym)) (var2 (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1321 (while (memq (car args) '(in of property from to))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1322 (cond ((eq (car args) 'from) (setq from (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1323 ((eq (car args) 'to) (setq to (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1324 ((eq (car args) 'property)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1325 (setq prop (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1326 (t (setq buf (cl-pop2 args)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1327 (if (and (consp var) (symbolp (car var)) (symbolp (cdr var)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1328 (setq var1 (car var) var2 (cdr var))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1329 (push (list var (list 'cons var1 var2)) loop-for-sets))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1330 (setq loop-map-form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1331 (list 'cl-map-intervals
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1332 (list 'function (list 'lambda (list var1 var2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1333 '(progn . --cl-map)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1334 buf prop from to))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1335
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1336 ((memq word key-types)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1337 (or (memq (car args) '(in of)) (error "Expected `of'"))
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1338 (let* ((map (cl-pop2 args))
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1339 other-word
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1340 (other (if (eq (car args) 'using)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1341 (if (and (= (length (cadr args)) 2)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1342 (memq (setq other-word (caadr args))
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1343 key-types)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1344 (not (eq (caadr args) word)))
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1345 (cadr (cl-pop2 args))
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1346 (error "Bad `using' clause"))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1347 (gensym))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1348 ;; XEmacs addition: track other-word
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1349 (when (memq word '(key-binding key-bindings))
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1350 (setq var (prog1 other (setq other var)))
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1351 (and other-word (setq word other-word)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1352 (setq loop-map-form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1353 (list (if (memq word '(key-seq key-seqs))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1354 'cl-map-keymap-recursively 'map-keymap)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1355 (list 'function (list* 'lambda (list var other)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1356 '--cl-map)) map))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1357
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1358 ((memq word '(frame frames screen screens))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1359 (let ((temp (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1360 (push (list var '(selected-frame))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1361 loop-for-bindings)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1362 (push (list temp nil) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1363 (push (list 'prog1 (list 'not (list 'eq var temp))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1364 (list 'or temp (list 'setq temp var)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1365 loop-body)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1366 (push (list var (list 'next-frame var))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1367 loop-for-steps)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1368
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1369 ((memq word '(window windows))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1370 (let ((scr (and (memq (car args) '(in of)) (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1371 (temp (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1372 (push (list var (if scr
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1373 (list 'frame-selected-window scr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1374 '(selected-window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1375 loop-for-bindings)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1376 (push (list temp nil) loop-for-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1377 (push (list 'prog1 (list 'not (list 'eq var temp))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1378 (list 'or temp (list 'setq temp var)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1379 loop-body)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1380 (push (list var (list 'next-window var)) loop-for-steps)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1381
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1382 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1383 (let ((handler (and (symbolp word)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1384 (get word 'cl-loop-for-handler))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1385 (if handler
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1386 (funcall handler var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1387 (error "Expected a `for' preposition, found %s" word)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1388 (eq (car args) 'and))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1389 (setq ands t)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1390 (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1391 (if (and ands loop-for-bindings)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1392 (push (nreverse loop-for-bindings) loop-bindings)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1393 (setq loop-bindings (nconc (mapcar 'list loop-for-bindings)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1394 loop-bindings)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1395 (if loop-for-sets
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1396 (push (list 'progn
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1397 (cl-loop-let (nreverse loop-for-sets) 'setq ands)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1398 t) loop-body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1399 (if loop-for-steps
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1400 (push (cons (if ands 'psetq 'setq)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1401 (apply 'append (nreverse loop-for-steps)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1402 loop-steps))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1403
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1404 ((eq word 'repeat)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1405 (let ((temp (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1406 (push (list (list temp (pop args))) loop-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1407 (push (list '>= (list 'setq temp (list '1- temp)) 0) loop-body)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1408
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1409 ((memq word '(collect collecting))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1410 (let ((what (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1411 (var (cl-loop-handle-accum nil 'nreverse)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1412 (if (eq var loop-accum-var)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1413 (push (list 'progn (list 'push what var) t) loop-body)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1414 (push (list 'progn
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1415 (list 'setq var (list 'nconc var (list 'list what)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1416 t) loop-body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1417
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1418 ((memq word '(nconc nconcing append appending))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1419 (let ((what (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1420 (var (cl-loop-handle-accum nil 'nreverse)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1421 (push (list 'progn
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1422 (list 'setq var
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1423 (if (eq var loop-accum-var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1424 (list 'nconc
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1425 (list (if (memq word '(nconc nconcing))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1426 'nreverse 'reverse)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1427 what)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1428 var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1429 (list (if (memq word '(nconc nconcing))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1430 'nconc 'append)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1431 var what))) t) loop-body)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1432
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1433 ((memq word '(concat concating))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1434 (let ((what (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1435 (var (cl-loop-handle-accum "")))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1436 (push (list 'progn (list 'callf 'concat var what) t) loop-body)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1437
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1438 ((memq word '(vconcat vconcating))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1439 (let ((what (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1440 (var (cl-loop-handle-accum [])))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1441 (push (list 'progn (list 'callf 'vconcat var what) t) loop-body)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1442
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1443 ;; XEmacs addition: handle bit-vectors
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1444 ((memq word '(bvconcat bvconcating))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1445 (let ((what (pop args))
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1446 (var (cl-loop-handle-accum #*)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1447 (push (list 'progn (list 'callf 'bvconcat var what) t) loop-body)))
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 613
diff changeset
1448
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1449 ((memq word '(sum summing))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1450 (let ((what (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1451 (var (cl-loop-handle-accum 0)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1452 (push (list 'progn (list 'incf var what) t) loop-body)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1453
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1454 ((memq word '(count counting))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1455 (let ((what (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1456 (var (cl-loop-handle-accum 0)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1457 (push (list 'progn (list 'if what (list 'incf var)) t) loop-body)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1458
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1459 ((memq word '(minimize minimizing maximize maximizing))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1460 (let* ((what (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1461 (temp (if (cl-simple-expr-p what) what (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1462 (var (cl-loop-handle-accum nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1463 (func (intern (substring (symbol-name word) 0 3)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1464 (set (list 'setq var (list 'if var (list func var temp) temp))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1465 (push (list 'progn (if (eq temp what) set
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1466 (list 'let (list (list temp what)) set))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1467 t) loop-body)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1468
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1469 ((eq word 'with)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1470 (let ((bindings nil))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1471 (while (progn (push (list (pop args)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1472 (and (eq (car args) '=) (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1473 bindings)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1474 (eq (car args) 'and))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1475 (pop args))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1476 (push (nreverse bindings) loop-bindings)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1477
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1478 ((eq word 'while)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1479 (push (pop args) loop-body))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1480
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1481 ((eq word 'until)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1482 (push (list 'not (pop args)) loop-body))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1483
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1484 ((eq word 'always)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1485 (or loop-finish-flag (setq loop-finish-flag (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1486 (push (list 'setq loop-finish-flag (pop args)) loop-body)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1487 (setq loop-result t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1488
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1489 ((eq word 'never)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1490 (or loop-finish-flag (setq loop-finish-flag (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1491 (push (list 'setq loop-finish-flag (list 'not (pop args)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1492 loop-body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1493 (setq loop-result t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1494
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1495 ((eq word 'thereis)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1496 (or loop-finish-flag (setq loop-finish-flag (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1497 (or loop-result-var (setq loop-result-var (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1498 (push (list 'setq loop-finish-flag
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1499 (list 'not (list 'setq loop-result-var (pop args))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1500 loop-body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1501
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1502 ((memq word '(if when unless))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1503 (let* ((cond (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1504 (then (let ((loop-body nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1505 (cl-parse-loop-clause)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1506 (cl-loop-build-ands (nreverse loop-body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1507 (else (let ((loop-body nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1508 (if (eq (car args) 'else)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1509 (progn (pop args) (cl-parse-loop-clause)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1510 (cl-loop-build-ands (nreverse loop-body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1511 (simple (and (eq (car then) t) (eq (car else) t))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1512 (if (eq (car args) 'end) (pop args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1513 (if (eq word 'unless) (setq then (prog1 else (setq else then))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1514 (let ((form (cons (if simple (cons 'progn (nth 1 then)) (nth 2 then))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1515 (if simple (nth 1 else) (list (nth 2 else))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1516 (if (cl-expr-contains form 'it)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1517 (let ((temp (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1518 (push (list temp) loop-bindings)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1519 (setq form (list* 'if (list 'setq temp cond)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1520 (subst temp 'it form))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1521 (setq form (list* 'if cond form)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1522 (push (if simple (list 'progn form t) form) loop-body))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1523
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1524 ((memq word '(do doing))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1525 (let ((body nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1526 (or (consp (car args)) (error "Syntax error on `do' clause"))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1527 (while (consp (car args)) (push (pop args) body))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1528 (push (cons 'progn (nreverse (cons t body))) loop-body)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1529
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1530 ((eq word 'return)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1531 (or loop-finish-flag (setq loop-finish-flag (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1532 (or loop-result-var (setq loop-result-var (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1533 (push (list 'setq loop-result-var (pop args)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1534 loop-finish-flag nil) loop-body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1535
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1536 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1537 (let ((handler (and (symbolp word) (get word 'cl-loop-handler))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1538 (or handler (error "Expected a loop keyword, found %s" word))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1539 (funcall handler))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1540 (if (eq (car args) 'and)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1541 (progn (pop args) (cl-parse-loop-clause)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1542
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1543 (defun cl-loop-let (specs body par) ; uses loop-*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1544 (let ((p specs) (temps nil) (new nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1545 (while (and p (or (symbolp (car-safe (car p))) (null (cadar p))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1546 (setq p (cdr p)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1547 (and par p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1548 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1549 (setq par nil p specs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1550 (while p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1551 (or (cl-const-expr-p (cadar p))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1552 (let ((temp (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1553 (push (list temp (cadar p)) temps)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1554 (setcar (cdar p) temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1555 (setq p (cdr p)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1556 (while specs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1557 (if (and (consp (car specs)) (listp (caar specs)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1558 (let* ((spec (caar specs)) (nspecs nil)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1559 (expr (cadr (pop specs)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1560 (temp (cdr (or (assq spec loop-destr-temps)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1561 (car (push (cons spec (or (last spec 0)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1562 (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1563 loop-destr-temps))))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1564 (push (list temp expr) new)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1565 (while (consp spec)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1566 (push (list (pop spec)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1567 (and expr (list (if spec 'pop 'car) temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1568 nspecs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1569 (setq specs (nconc (nreverse nspecs) specs)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1570 (push (pop specs) new)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1571 (if (eq body 'setq)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1572 (let ((set (cons (if par 'psetq 'setq) (apply 'nconc (nreverse new)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1573 (if temps (list 'let* (nreverse temps) set) set))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1574 (list* (if par 'let 'let*)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1575 (nconc (nreverse temps) (nreverse new)) body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1576
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1577 (defun cl-loop-handle-accum (def &optional func) ; uses args, loop-*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1578 (if (eq (car args) 'into)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1579 (let ((var (cl-pop2 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1580 (or (memq var loop-accum-vars)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1581 (progn (push (list (list var def)) loop-bindings)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1582 (push var loop-accum-vars)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1583 var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1584 (or loop-accum-var
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1585 (progn
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1586 (push (list (list (setq loop-accum-var (gensym)) def))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1587 loop-bindings)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1588 (setq loop-result (if func (list func loop-accum-var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1589 loop-accum-var))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1590 loop-accum-var))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1591
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1592 (defun cl-loop-build-ands (clauses)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1593 (let ((ands nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1594 (body nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1595 (while clauses
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1596 (if (and (eq (car-safe (car clauses)) 'progn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1597 (eq (car (last (car clauses))) t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1598 (if (cdr clauses)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1599 (setq clauses (cons (nconc (butlast (car clauses))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1600 (if (eq (car-safe (cadr clauses))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1601 'progn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1602 (cdadr clauses)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1603 (list (cadr clauses))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1604 (cddr clauses)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1605 (setq body (cdr (butlast (pop clauses)))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1606 (push (pop clauses) ands)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1607 (setq ands (or (nreverse ands) (list t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1608 (list (if (cdr ands) (cons 'and ands) (car ands))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1609 body
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1610 (let ((full (if body
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1611 (append ands (list (cons 'progn (append body '(t)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1612 ands)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1613 (if (cdr full) (cons 'and full) (car full))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1614
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1615
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1616 ;;; Other iteration control structures.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1617
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1618 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1619 (defmacro do (steps endtest &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1620 "The Common Lisp `do' loop.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1621 Format is: (do ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1622 (cl-expand-do-loop steps endtest body nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1623
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1624 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1625 (defmacro do* (steps endtest &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1626 "The Common Lisp `do*' loop.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1627 Format is: (do* ((VAR INIT [STEP])...) (END-TEST [RESULT...]) BODY...)"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1628 (cl-expand-do-loop steps endtest body t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1629
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1630 (defun cl-expand-do-loop (steps endtest body star)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1631 (list 'block nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1632 (list* (if star 'let* 'let)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1633 (mapcar #'(lambda (c) (if (consp c) (list (car c) (nth 1 c)) c))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1634 steps)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1635 (list* 'while (list 'not (car endtest))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1636 (append body
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1637 (let ((sets (mapcar
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1638 #'(lambda (c)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1639 (and (consp c) (cdr (cdr c))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1640 (list (car c) (nth 2 c))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1641 steps)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1642 (setq sets (delq nil sets))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1643 (and sets
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1644 (list (cons (if (or star (not (cdr sets)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1645 'setq 'psetq)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1646 (apply 'append sets)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1647 (or (cdr endtest) '(nil)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1648
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1649 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1650 (defmacro dolist (spec &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1651 "(dolist (VAR LIST [RESULT]) BODY...): loop over a list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1652 Evaluate BODY with VAR bound to each `car' from LIST, in turn.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1653 Then evaluate RESULT to get return value, default nil."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1654 (let ((temp (gensym "--dolist-temp--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1655 (list 'block nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1656 (list* 'let (list (list temp (nth 1 spec)) (car spec))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1657 (list* 'while temp (list 'setq (car spec) (list 'car temp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1658 (append body (list (list 'setq temp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1659 (list 'cdr temp)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1660 (if (cdr (cdr spec))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1661 (cons (list 'setq (car spec) nil) (cdr (cdr spec)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1662 '(nil))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1663
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1664 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1665 (defmacro dotimes (spec &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1666 "(dotimes (VAR COUNT [RESULT]) BODY...): loop a certain number of times.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1667 Evaluate BODY with VAR bound to successive integers from 0, inclusive,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1668 to COUNT, exclusive. Then evaluate RESULT to get return value, default
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1669 nil."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1670 (let ((temp (gensym "--dotimes-temp--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1671 (list 'block nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1672 (list* 'let (list (list temp (nth 1 spec)) (list (car spec) 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1673 (list* 'while (list '< (car spec) temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1674 (append body (list (list 'incf (car spec)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1675 (or (cdr (cdr spec)) '(nil))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1676
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1677 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1678 (defmacro do-symbols (spec &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1679 "(dosymbols (VAR [OBARRAY [RESULT]]) BODY...): loop over all symbols.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1680 Evaluate BODY with VAR bound to each interned symbol, or to each symbol
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1681 from OBARRAY."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1682 ;; Apparently this doesn't have an implicit block.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1683 (list 'block nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1684 (list 'let (list (car spec))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1685 (list* 'mapatoms
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1686 (list 'function (list* 'lambda (list (car spec)) body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1687 (and (cadr spec) (list (cadr spec))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1688 (caddr spec))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1689
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1690 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1691 (defmacro do-all-symbols (spec &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1692 (list* 'do-symbols (list (car spec) nil (cadr spec)) body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1693
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1694
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1695 ;;; Assignments.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1696
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1697 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1698 (defmacro psetq (&rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1699 "(psetq SYM VAL SYM VAL ...): set SYMs to the values VALs in parallel.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1700 This is like `setq', except that all VAL forms are evaluated (in order)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1701 before assigning any symbols SYM to the corresponding values."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1702 (cons 'psetf args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1703
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1704
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1705 ;;; Binding control structures.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1706
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1707 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1708 (defmacro progv (symbols values &rest body)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
1709 "Bind SYMBOLS to VALUES dynamically in BODY.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1710 The forms SYMBOLS and VALUES are evaluated, and must evaluate to lists.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1711 Each SYMBOL in the first list is bound to the corresponding VALUE in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1712 second list (or made unbound if VALUES is shorter than SYMBOLS); then the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1713 BODY forms are executed and their result is returned. This is much like
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1714 a `let' form, except that the list of symbols can be computed at run-time."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1715 (list 'let '((cl-progv-save nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1716 (list 'unwind-protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1717 (list* 'progn (list 'cl-progv-before symbols values) body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1718 '(cl-progv-after))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1719
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1720 ;;; This should really have some way to shadow 'byte-compile properties, etc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1721 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1722 (defmacro flet (bindings &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1723 "(flet ((FUNC ARGLIST BODY...) ...) FORM...): make temporary function defns.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1724 This is an analogue of `let' that operates on the function cell of FUNC
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1725 rather than its value cell. The FORMs are evaluated with the specified
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1726 function definitions in place, then the definitions are undone (the FUNCs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1727 go back to their previous definitions, or lack thereof)."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1728 (list* 'letf*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1729 (mapcar
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1730 #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1731 (if (or (and (fboundp (car x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1732 (eq (car-safe (symbol-function (car x))) 'macro))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1733 (cdr (assq (car x) cl-macro-environment)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1734 (error "Use `labels', not `flet', to rebind macro names"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1735 (let ((func (list 'function*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1736 (list 'lambda (cadr x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1737 (list* 'block (car x) (cddr x))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1738 (if (and (cl-compiling-file)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1739 (boundp 'byte-compile-function-environment))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1740 (push (cons (car x) (eval func))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1741 byte-compile-function-environment))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1742 (list (list 'symbol-function (list 'quote (car x))) func)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1743 bindings)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1744 body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1745
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1746 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1747 (defmacro labels (bindings &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1748 "(labels ((FUNC ARGLIST BODY...) ...) FORM...): make temporary func bindings.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1749 This is like `flet', except the bindings are lexical instead of dynamic.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1750 Unlike `flet', this macro is fully compliant with the Common Lisp standard."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1751 (let ((vars nil) (sets nil) (cl-macro-environment cl-macro-environment))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1752 (while bindings
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1753 (let ((var (gensym)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1754 (push var vars)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1755 (push (list 'function* (cons 'lambda (cdar bindings))) sets)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1756 (push var sets)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1757 (push (list (car (pop bindings)) 'lambda '(&rest cl-labels-args)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1758 (list 'list* '(quote funcall) (list 'quote var)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1759 'cl-labels-args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1760 cl-macro-environment)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1761 (cl-macroexpand-all (list* 'lexical-let vars (cons (cons 'setq sets) body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1762 cl-macro-environment)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1763
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1764 ;; The following ought to have a better definition for use with newer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1765 ;; byte compilers.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1766 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1767 (defmacro macrolet (bindings &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1768 "(macrolet ((NAME ARGLIST BODY...) ...) FORM...): make temporary macro defns.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1769 This is like `flet', but for macros instead of functions."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1770 (if (cdr bindings)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1771 (list 'macrolet
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1772 (list (car bindings)) (list* 'macrolet (cdr bindings) body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1773 (if (null bindings) (cons 'progn body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1774 (let* ((name (caar bindings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1775 (res (cl-transform-lambda (cdar bindings) name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1776 (eval (car res))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1777 (cl-macroexpand-all (cons 'progn body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1778 (cons (list* name 'lambda (cdr res))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1779 cl-macro-environment))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1780
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1781 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1782 (defmacro symbol-macrolet (bindings &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1783 "(symbol-macrolet ((NAME EXPANSION) ...) FORM...): make symbol macro defns.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1784 Within the body FORMs, references to the variable NAME will be replaced
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1785 by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...)."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1786 (if (cdr bindings)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1787 (list 'symbol-macrolet
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1788 (list (car bindings)) (list* 'symbol-macrolet (cdr bindings) body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1789 (if (null bindings) (cons 'progn body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1790 (cl-macroexpand-all (cons 'progn body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1791 (cons (list (symbol-name (caar bindings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1792 (cadar bindings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1793 cl-macro-environment)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1794
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1795 (defvar cl-closure-vars nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1796 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1797 (defmacro lexical-let (bindings &rest body)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
1798 "Like `let', but lexically scoped.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1799 The main visible difference is that lambdas inside BODY will create
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1800 lexical closures as in Common Lisp."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1801 (let* ((cl-closure-vars cl-closure-vars)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1802 (vars (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1803 (or (consp x) (setq x (list x)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1804 (push (gensym (format "--%s--" (car x)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1805 cl-closure-vars)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1806 (set (car cl-closure-vars) [bad-lexical-ref])
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1807 (list (car x) (cadr x) (car cl-closure-vars)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1808 bindings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1809 (ebody
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1810 (cl-macroexpand-all
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1811 (cons 'progn body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1812 (nconc (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1813 (list (symbol-name (car x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1814 (list 'symbol-value (caddr x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1815 t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1816 vars)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1817 (list '(defun . cl-defun-expander))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1818 cl-macro-environment))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1819 (if (not (get (car (last cl-closure-vars)) 'used))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1820 (list 'let (mapcar #'(lambda (x) (list (caddr x) (cadr x))) vars)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1821 (sublis (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1822 (cons (caddr x) (list 'quote (caddr x))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1823 vars)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1824 ebody))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1825 (list 'let (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1826 (list (caddr x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1827 (list 'make-symbol
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1828 (format "--%s--" (car x)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1829 vars)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1830 (apply 'append '(setf)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1831 (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1832 (list (list 'symbol-value (caddr x)) (cadr x)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1833 vars))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1834 ebody))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1835
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1836 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1837 (defmacro lexical-let* (bindings &rest body)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
1838 "Like `let*', but lexically scoped.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1839 The main visible difference is that lambdas inside BODY will create
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1840 lexical closures as in Common Lisp."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1841 (if (null bindings) (cons 'progn body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1842 (setq bindings (reverse bindings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1843 (while bindings
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1844 (setq body (list (list* 'lexical-let (list (pop bindings)) body))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1845 (car body)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1846
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1847 (defun cl-defun-expander (func &rest rest)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1848 (list 'progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1849 (list 'defalias (list 'quote func)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1850 (list 'function (cons 'lambda rest)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1851 (list 'quote func)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1852
4677
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1853 ;;; Multiple values. We support full Common Lisp conventions here.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1854
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1855 ;;;###autoload
4677
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1856 (defmacro multiple-value-bind (syms form &rest body)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1857 "Collect and bind multiple return values.
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1858
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1859 If FORM returns multiple values, each symbol in SYMS is bound to one of
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1860 them, in order, and BODY is executed. If FORM returns fewer multiple values
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1861 than there are SYMS, remaining SYMS are bound to nil. If FORM does
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1862 not return multiple values, it is treated as returning one multiple value.
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1863
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1864 Returns the value given by the last element of BODY."
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1865 (if (null syms)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1866 `(progn ,form ,@body)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1867 (if (= 1 (length syms))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1868 ;; Code written to deal with other "implementations" of multiple
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1869 ;; values may have a one-element SYMS.
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1870 `(let ((,(car syms) ,form))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1871 ,@body)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1872 (let ((temp (gensym)))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1873 `(let* ((,temp (multiple-value-list-internal 0 ,(length syms) ,form))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1874 ,@(loop
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1875 for var in syms
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1876 collect `(,var (prog1 (car ,temp)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1877 (setq ,temp (cdr ,temp))))))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1878 ,@body)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1879
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1880 ;;;###autoload
4677
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1881 (defmacro multiple-value-setq (syms form)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1882 "Collect and set multiple values.
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1883
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1884 FORM should normally return multiple values; the first N values are stored
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1885 in the symbols in SYMS in turn. If FORM returns fewer than N values, the
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1886 remaining symbols have their values set to nil. FORM not returning multiple
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1887 values is treated as FORM returning one multiple value, with other elements
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1888 of SYMS initialized to nil.
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1889
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1890 Returns the first of the multiple values given by FORM."
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1891 (if (null syms)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1892 ;; Never return multiple values from multiple-value-setq:
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1893 (and form `(values ,form))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1894 (if (= 1 (length syms))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1895 `(setq ,(car syms) ,form)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1896 (let ((temp (gensym)))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1897 `(let* ((,temp (multiple-value-list-internal 0 ,(length syms) ,form)))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1898 (setq ,@(loop
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1899 for sym in syms
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1900 nconc `(,sym (car-safe ,temp)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1901 ,temp (cdr-safe ,temp))))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1902 ,(car syms))))))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1903
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1904 ;;;###autoload
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1905 (defmacro multiple-value-list (form)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1906 "Evaluate FORM and return a list of the multiple values it returned."
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1907 `(multiple-value-list-internal 0 multiple-values-limit ,form))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1908
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1909 ;;;###autoload
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1910 (defmacro nth-value (n form)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1911 "Evaluate FORM and return the Nth multiple value it returned."
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1912 (if (integerp n)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1913 `(car (multiple-value-list-internal ,n ,(1+ n) ,form))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1914 (let ((temp (gensym)))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1915 `(let ((,temp ,n))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
1916 (car (multiple-value-list-internal ,temp (1+ ,temp) ,form))))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1917
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1918 ;;; Declarations.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1919
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1920 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1921 (defmacro locally (&rest body) (cons 'progn body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1922 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1923 (defmacro the (type form) form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1924
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1925 (defvar cl-proclaim-history t) ; for future compilers
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1926 (defvar cl-declare-stack t) ; for future compilers
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1927
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1928 (defun cl-do-proclaim (spec hist)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1929 (and hist (listp cl-proclaim-history) (push spec cl-proclaim-history))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1930 (cond ((eq (car-safe spec) 'special)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1931 (if (boundp 'byte-compile-bound-variables)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1932 (setq byte-compile-bound-variables
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1933 (append
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1934 ;; XEmacs change
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1935 (mapcar #'(lambda (v) (cons v byte-compile-global-bit))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1936 (cdr spec))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1937 byte-compile-bound-variables))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1938
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1939 ((eq (car-safe spec) 'inline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1940 (while (setq spec (cdr spec))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1941 (or (memq (get (car spec) 'byte-optimizer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1942 '(nil byte-compile-inline-expand))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1943 (error "%s already has a byte-optimizer, can't make it inline"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1944 (car spec)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1945 (put (car spec) 'byte-optimizer 'byte-compile-inline-expand)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1946
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1947 ((eq (car-safe spec) 'notinline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1948 (while (setq spec (cdr spec))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1949 (if (eq (get (car spec) 'byte-optimizer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1950 'byte-compile-inline-expand)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1951 (put (car spec) 'byte-optimizer nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1952
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1953 ((eq (car-safe spec) 'optimize)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1954 (let ((speed (assq (nth 1 (assq 'speed (cdr spec)))
446
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
1955 '((0 . nil) (1 . t) (2 . t) (3 . t))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1956 (safety (assq (nth 1 (assq 'safety (cdr spec)))
446
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
1957 '((0 . t) (1 . t) (2 . t) (3 . nil)))))
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
1958 (when speed
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
1959 (setq cl-optimize-speed (car speed)
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
1960 byte-optimize (cdr speed)))
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
1961 (when safety
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
1962 (setq cl-optimize-safety (car safety)
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
1963 byte-compile-delete-errors (cdr safety)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1964
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1965 ((and (eq (car-safe spec) 'warn) (boundp 'byte-compile-warnings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1966 (if (eq byte-compile-warnings t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1967 ;; XEmacs change
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1968 (setq byte-compile-warnings byte-compile-default-warnings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1969 (while (setq spec (cdr spec))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1970 (if (consp (car spec))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1971 (if (eq (cadar spec) 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1972 (setq byte-compile-warnings
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1973 (delq (caar spec) byte-compile-warnings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1974 (setq byte-compile-warnings
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1975 (adjoin (caar spec) byte-compile-warnings)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1976 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1977
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1978 ;;; Process any proclamations made before cl-macs was loaded.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1979 (defvar cl-proclaims-deferred)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1980 (let ((p (reverse cl-proclaims-deferred)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1981 (while p (cl-do-proclaim (pop p) t))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1982 (setq cl-proclaims-deferred nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1983
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1984 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1985 (defmacro declare (&rest specs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1986 (if (cl-compiling-file)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1987 (while specs
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1988 (if (listp cl-declare-stack) (push (car specs) cl-declare-stack))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
1989 (cl-do-proclaim (pop specs) nil)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1990 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1991
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1992
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1993
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1994 ;;; Generalized variables.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1995
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1996 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1997 (defmacro define-setf-method (func args &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1998 "(define-setf-method NAME ARGLIST BODY...): define a `setf' method.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1999 This method shows how to handle `setf's to places of the form (NAME ARGS...).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2000 The argument forms ARGS are bound according to ARGLIST, as if NAME were
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2001 going to be expanded as a macro, then the BODY forms are executed and must
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2002 return a list of five elements: a temporary-variables list, a value-forms
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2003 list, a store-variables list (of length one), a store-form, and an access-
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2004 form. See `defsetf' for a simpler way to define most setf-methods."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2005 (append '(eval-when (compile load eval))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2006 (if (stringp (car body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2007 (list (list 'put (list 'quote func) '(quote setf-documentation)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2008 (pop body))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2009 (list (cl-transform-function-property
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2010 func 'setf-method (cons args body)))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2011 (defalias 'define-setf-expander 'define-setf-method)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2012
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2013 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2014 (defmacro defsetf (func arg1 &rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2015 "(defsetf NAME FUNC): define a `setf' method.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2016 This macro is an easy-to-use substitute for `define-setf-method' that works
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2017 well for simple place forms. In the simple `defsetf' form, `setf's of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2018 the form (setf (NAME ARGS...) VAL) are transformed to function or macro
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2019 calls of the form (FUNC ARGS... VAL). Example: (defsetf aref aset).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2020 Alternate form: (defsetf NAME ARGLIST (STORE) BODY...).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2021 Here, the above `setf' call is expanded by binding the argument forms ARGS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2022 according to ARGLIST, binding the value form VAL to STORE, then executing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2023 BODY, which must return a Lisp form that does the necessary `setf' operation.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2024 Actually, ARGLIST and STORE may be bound to temporary variables which are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2025 introduced automatically to preserve proper execution order of the arguments.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2026 Example: (defsetf nth (n x) (v) (list 'setcar (list 'nthcdr n x) v))."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2027 (if (listp arg1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2028 (let* ((largs nil) (largsr nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2029 (temps nil) (tempsr nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2030 (restarg nil) (rest-temps nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2031 (store-var (car (prog1 (car args) (setq args (cdr args)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2032 (store-temp (intern (format "--%s--temp--" store-var)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2033 (lets1 nil) (lets2 nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2034 (docstr nil) (p arg1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2035 (if (stringp (car args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2036 (setq docstr (prog1 (car args) (setq args (cdr args)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2037 (while (and p (not (eq (car p) '&aux)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2038 (if (eq (car p) '&rest)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2039 (setq p (cdr p) restarg (car p))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2040 (or (memq (car p) '(&optional &key &allow-other-keys))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2041 (setq largs (cons (if (consp (car p)) (car (car p)) (car p))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2042 largs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2043 temps (cons (intern (format "--%s--temp--" (car largs)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2044 temps))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2045 (setq p (cdr p)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2046 (setq largs (nreverse largs) temps (nreverse temps))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2047 (if restarg
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2048 (setq largsr (append largs (list restarg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2049 rest-temps (intern (format "--%s--temp--" restarg))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2050 tempsr (append temps (list rest-temps)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2051 (setq largsr largs tempsr temps))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2052 (let ((p1 largs) (p2 temps))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2053 (while p1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2054 (setq lets1 (cons (list (car p2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2055 (list 'gensym (format "--%s--" (car p1))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2056 lets1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2057 lets2 (cons (list (car p1) (car p2)) lets2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2058 p1 (cdr p1) p2 (cdr p2))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2059 (if restarg (setq lets2 (cons (list restarg rest-temps) lets2)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2060 (append (list 'define-setf-method func arg1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2061 (and docstr (list docstr))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2062 (list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2063 (list 'let*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2064 (nreverse
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2065 (cons (list store-temp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2066 (list 'gensym (format "--%s--" store-var)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2067 (if restarg
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2068 (append
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2069 (list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2070 (list rest-temps
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2071 (list 'mapcar '(quote gensym)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2072 restarg)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2073 lets1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2074 lets1)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2075 (list 'list ; 'values
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2076 (cons (if restarg 'list* 'list) tempsr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2077 (cons (if restarg 'list* 'list) largsr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2078 (list 'list store-temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2079 (cons 'let*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2080 (cons (nreverse
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2081 (cons (list store-var store-temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2082 lets2))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2083 args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2084 (cons (if restarg 'list* 'list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2085 (cons (list 'quote func) tempsr)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2086 (list 'defsetf func '(&rest args) '(store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2087 (let ((call (list 'cons (list 'quote arg1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2088 '(append args (list store)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2089 (if (car args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2090 (list 'list '(quote progn) call 'store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2091 call)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2092
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2093 ;;; Some standard place types from Common Lisp.
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2094 (eval-when-compile (defvar ignored-arg)) ; XEmacs: warning suppression
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2095 (defsetf aref aset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2096 (defsetf car setcar)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2097 (defsetf cdr setcdr)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2098 (defsetf caar (x) (val) (list 'setcar (list 'car x) val))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2099 (defsetf cadr (x) (val) (list 'setcar (list 'cdr x) val))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2100 (defsetf cdar (x) (val) (list 'setcdr (list 'car x) val))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2101 (defsetf cddr (x) (val) (list 'setcdr (list 'cdr x) val))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2102 (defsetf elt (seq n) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2103 (list 'if (list 'listp seq) (list 'setcar (list 'nthcdr n seq) store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2104 (list 'aset seq n store)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2105 ;; XEmacs change: ignore the optional DEFAULT arguments
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2106 (defsetf get (x y &optional ignored-arg) (store) (list 'put x y store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2107 (defsetf get* (x y &optional ignored-arg) (store) (list 'put x y store))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2108 (defsetf gethash (x h &optional ignored-arg) (store) (list 'puthash x store h))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2109 (defsetf nth (n x) (store) (list 'setcar (list 'nthcdr n x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2110 (defsetf subseq (seq start &optional end) (new)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2111 (list 'progn (list 'replace seq new :start1 start :end1 end) new))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2112 (defsetf symbol-function fset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2113 (defsetf symbol-plist setplist)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2114 (defsetf symbol-value set)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2115
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2116 ;;; Various car/cdr aliases. Note that `cadr' is handled specially.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2117 (defsetf first setcar)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2118 (defsetf second (x) (store) (list 'setcar (list 'cdr x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2119 (defsetf third (x) (store) (list 'setcar (list 'cddr x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2120 (defsetf fourth (x) (store) (list 'setcar (list 'cdddr x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2121 (defsetf fifth (x) (store) (list 'setcar (list 'nthcdr 4 x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2122 (defsetf sixth (x) (store) (list 'setcar (list 'nthcdr 5 x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2123 (defsetf seventh (x) (store) (list 'setcar (list 'nthcdr 6 x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2124 (defsetf eighth (x) (store) (list 'setcar (list 'nthcdr 7 x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2125 (defsetf ninth (x) (store) (list 'setcar (list 'nthcdr 8 x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2126 (defsetf tenth (x) (store) (list 'setcar (list 'nthcdr 9 x) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2127 (defsetf rest setcdr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2128
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2129 ;;; Some more Emacs-related place types.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2130 (defsetf buffer-file-name set-visited-file-name t)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2131 ;; XEmacs change: we do not need to wrap this in with-current-buffer
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2132 (defsetf buffer-modified-p set-buffer-modified-p t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2133 (defsetf buffer-name rename-buffer t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2134 (defsetf buffer-string () (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2135 (list 'progn '(erase-buffer) (list 'insert store)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2136 (defsetf buffer-substring cl-set-buffer-substring)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2137 (defsetf current-buffer set-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2138 (defsetf current-case-table set-case-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2139 (defsetf current-column move-to-column t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2140 (defsetf current-global-map use-global-map t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2141 (defsetf current-input-mode () (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2142 (list 'progn (list 'apply 'set-input-mode store) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2143 (defsetf current-local-map use-local-map t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2144 (defsetf current-window-configuration set-window-configuration t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2145 (defsetf default-file-modes set-default-file-modes t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2146 (defsetf default-value set-default)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2147 (defsetf documentation-property put)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2148 ;;(defsetf extent-data set-extent-data)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2149 (defsetf extent-face set-extent-face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2150 (defsetf extent-priority set-extent-priority)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2151 ;; XEmacs addition
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2152 (defsetf extent-property (x y &optional ignored-arg) (arg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2153 (list 'set-extent-property x y arg))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2154 (defsetf extent-end-position (ext) (store)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2155 `(progn (set-extent-endpoints ,ext (extent-start-position ,ext) ,store)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2156 ,store))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2157 (defsetf extent-start-position (ext) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2158 `(progn (set-extent-endpoints ,ext ,store (extent-end-position ,ext))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2159 ,store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2160 (defsetf face-background (f &optional s) (x) (list 'set-face-background f x s))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2161 (defsetf face-background-pixmap (f &optional s) (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2162 (list 'set-face-background-pixmap f x s))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2163 (defsetf face-font (f &optional s) (x) (list 'set-face-font f x s))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2164 (defsetf face-foreground (f &optional s) (x) (list 'set-face-foreground f x s))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2165 (defsetf face-underline-p (f &optional s) (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2166 (list 'set-face-underline-p f x s))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2167 (defsetf file-modes set-file-modes t)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2168 (defsetf frame-height (&optional f) (v)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2169 `(progn (set-frame-height ,f ,v) ,v))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2170 (defsetf frame-parameters modify-frame-parameters t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2171 (defsetf frame-visible-p cl-set-frame-visible-p)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2172 (defsetf frame-width (&optional f) (v)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2173 `(progn (set-frame-width ,f ,v) ,v))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2174 ;; XEmacs change: frame-properties instead of frame-parameters
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2175 (defsetf frame-properties (&optional f) (p)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2176 `(progn (set-frame-properties ,f ,p) ,p))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2177 (defsetf frame-property (f p &optional ignored-arg) (v)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2178 `(progn (set-frame-property ,f ,v) ,p))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2179 ;; XEmacs addition
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2180 (defsetf current-frame-configuration set-frame-configuration)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2181
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2182 ;; XEmacs: new stuff
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2183 ;; Consoles
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2184 (defsetf selected-console select-console t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2185 (defsetf selected-device select-device t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2186 (defsetf device-baud-rate (&optional d) (v)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2187 `(set-device-baud-rate ,d ,v))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2188 ;; This setf method is a bad idea, because set-specifier *adds* a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2189 ;; specification, rather than just setting it. The net effect is that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2190 ;; it makes specifier-instance return VAL, but other things don't work
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2191 ;; as expected -- letf, to name one.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2192 ;(defsetf specifier-instance (spec &optional dom def nof) (val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2193 ; `(set-specifier ,spec ,val ,dom))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2194
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2195 ;; Annotations
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2196 (defsetf annotation-glyph set-annotation-glyph)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2197 (defsetf annotation-down-glyph set-annotation-down-glyph)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2198 (defsetf annotation-face set-annotation-face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2199 (defsetf annotation-layout set-annotation-layout)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2200 (defsetf annotation-data set-annotation-data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2201 (defsetf annotation-action set-annotation-action)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2202 (defsetf annotation-menu set-annotation-menu)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2203 ;; Widget
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2204 (defsetf widget-get widget-put t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2205 (defsetf widget-value widget-value-set t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2206
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2207 ;; Misc
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2208 (defsetf recent-keys-ring-size set-recent-keys-ring-size)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2209 (defsetf symbol-value-in-buffer (s b &optional ignored-arg) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2210 `(with-current-buffer ,b (set ,s ,store)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2211 (defsetf symbol-value-in-console (s c &optional ignored-arg) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2212 `(letf (((selected-console) ,c))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2213 (set ,s ,store)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2214
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2215 (defsetf buffer-dedicated-frame (&optional b) (v)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2216 `(set-buffer-dedicated-frame ,b ,v))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2217 (defsetf console-type-image-conversion-list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2218 set-console-type-image-conversion-list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2219 (defsetf default-toolbar-position set-default-toolbar-position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2220 (defsetf device-class (&optional d) (v)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2221 `(set-device-class ,d ,v))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2222 (defsetf extent-begin-glyph set-extent-begin-glyph)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2223 (defsetf extent-begin-glyph-layout set-extent-begin-glyph-layout)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2224 (defsetf extent-end-glyph set-extent-end-glyph)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2225 (defsetf extent-end-glyph-layout set-extent-end-glyph-layout)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2226 (defsetf extent-keymap set-extent-keymap)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2227 (defsetf extent-parent set-extent-parent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2228 (defsetf extent-properties set-extent-properties)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2229 ;; Avoid adding various face and glyph functions.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2230 (defsetf frame-selected-window (&optional f) (v)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2231 `(set-frame-selected-window ,f ,v))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2232 (defsetf glyph-image (glyph &optional domain) (i)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2233 (list 'set-glyph-image glyph i domain))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2234 (defsetf itimer-function set-itimer-function)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2235 (defsetf itimer-function-arguments set-itimer-function-arguments)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2236 (defsetf itimer-is-idle set-itimer-is-idle)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2237 (defsetf itimer-recorded-run-time set-itimer-recorded-run-time)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2238 (defsetf itimer-restart set-itimer-restart)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2239 (defsetf itimer-uses-arguments set-itimer-uses-arguments)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2240 (defsetf itimer-value set-itimer-value)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2241 (defsetf keymap-parents set-keymap-parents)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2242 (defsetf marker-insertion-type set-marker-insertion-type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2243 (defsetf mouse-pixel-position (&optional d) (v)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2244 `(progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2245 (set-mouse-pixel-position ,d ,(car v) ,(car (cdr v)) ,(cdr (cdr v)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2246 ,v))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2247 (defsetf trunc-stack-length set-trunc-stack-length)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2248 (defsetf trunc-stack-stack set-trunc-stack-stack)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2249 (defsetf undoable-stack-max set-undoable-stack-max)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2250 (defsetf weak-list-list set-weak-list-list)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2251 ;; End of new XEmacs stuff
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2252
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2253 (defsetf getenv setenv t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2254 (defsetf get-register set-register)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2255 (defsetf global-key-binding global-set-key)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2256 (defsetf keymap-parent set-keymap-parent)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2257 ;; XEmacs addition: more keymap-related setf forms
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2258 (defsetf keymap-name set-keymap-name)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2259 (defsetf keymap-prompt set-keymap-prompt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2260 (defsetf keymap-default-binding set-keymap-default-binding)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2261 (defsetf local-key-binding local-set-key)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2262 (defsetf mark set-mark t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2263 (defsetf mark-marker set-mark t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2264 (defsetf marker-position set-marker t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2265 (defsetf match-data store-match-data t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2266 (defsetf mouse-position (scr) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2267 (list 'set-mouse-position scr (list 'car store) (list 'cadr store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2268 (list 'cddr store)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2269 (defsetf overlay-get overlay-put)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2270 (defsetf overlay-start (ov) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2271 (list 'progn (list 'move-overlay ov store (list 'overlay-end ov)) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2272 (defsetf overlay-end (ov) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2273 (list 'progn (list 'move-overlay ov (list 'overlay-start ov) store) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2274 (defsetf point goto-char)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2275 (defsetf point-marker goto-char t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2276 (defsetf point-max () (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2277 (list 'progn (list 'narrow-to-region '(point-min) store) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2278 (defsetf point-min () (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2279 (list 'progn (list 'narrow-to-region store '(point-max)) store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2280 (defsetf process-buffer set-process-buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2281 (defsetf process-filter set-process-filter)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2282 (defsetf process-sentinel set-process-sentinel)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2283 ;;(defsetf process-get process-put)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2284 (defsetf read-mouse-position (scr) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2285 (list 'set-mouse-position scr (list 'car store) (list 'cdr store)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2286 ;;(defsetf screen-height set-screen-height t)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2287 ;;(defsetf screen-width set-screen-width t)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2288 (defsetf selected-window select-window)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2289 ;;(defsetf selected-screen select-screen)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2290 (defsetf selected-frame select-frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2291 (defsetf standard-case-table set-standard-case-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2292 (defsetf syntax-table set-syntax-table)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2293 (defsetf visited-file-modtime set-visited-file-modtime t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2294 (defsetf window-buffer set-window-buffer t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2295 (defsetf window-display-table set-window-display-table t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2296 (defsetf window-dedicated-p set-window-dedicated-p t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2297 (defsetf window-height (&optional window) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2298 `(progn (enlarge-window (- ,store (window-height)) nil ,window) ,store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2299 (defsetf window-hscroll set-window-hscroll)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2300 (defsetf window-point set-window-point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2301 (defsetf window-start set-window-start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2302 (defsetf window-width (&optional window) (store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2303 `(progn (enlarge-window (- ,store (window-width)) t ,window) ,store))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2304 (defsetf x-get-cutbuffer x-store-cutbuffer t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2305 (defsetf x-get-cut-buffer x-store-cut-buffer t) ; groan.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2306 (defsetf x-get-secondary-selection x-own-secondary-selection t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2307 (defsetf x-get-selection x-own-selection t)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2308 (defsetf get-selection own-selection t)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2309
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2310 ;;; More complex setf-methods.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2311 ;;; These should take &environment arguments, but since full arglists aren't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2312 ;;; available while compiling cl-macs, we fake it by referring to the global
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2313 ;;; variable cl-macro-environment directly.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2314
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2315 (define-setf-method apply (func arg1 &rest rest)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2316 (or (and (memq (car-safe func) '(quote function function*))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2317 (symbolp (car-safe (cdr-safe func))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2318 (error "First arg to apply in setf is not (function SYM): %s" func))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2319 (let* ((form (cons (nth 1 func) (cons arg1 rest)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2320 (method (get-setf-method form cl-macro-environment)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2321 (list (car method) (nth 1 method) (nth 2 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2322 (cl-setf-make-apply (nth 3 method) (cadr func) (car method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2323 (cl-setf-make-apply (nth 4 method) (cadr func) (car method)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2324
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2325 (defun cl-setf-make-apply (form func temps)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2326 (if (eq (car form) 'progn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2327 (list* 'progn (cl-setf-make-apply (cadr form) func temps) (cddr form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2328 (or (equal (last form) (last temps))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2329 (error "%s is not suitable for use with setf-of-apply" func))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2330 (list* 'apply (list 'quote (car form)) (cdr form))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2331
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2332 (define-setf-method nthcdr (n place)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2333 (let ((method (get-setf-method place cl-macro-environment))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2334 (n-temp (gensym "--nthcdr-n--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2335 (store-temp (gensym "--nthcdr-store--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2336 (list (cons n-temp (car method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2337 (cons n (nth 1 method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2338 (list store-temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2339 (list 'let (list (list (car (nth 2 method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2340 (list 'cl-set-nthcdr n-temp (nth 4 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2341 store-temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2342 (nth 3 method) store-temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2343 (list 'nthcdr n-temp (nth 4 method)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2344
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2345 (define-setf-method getf (place tag &optional def)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2346 (let ((method (get-setf-method place cl-macro-environment))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2347 (tag-temp (gensym "--getf-tag--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2348 (def-temp (gensym "--getf-def--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2349 (store-temp (gensym "--getf-store--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2350 (list (append (car method) (list tag-temp def-temp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2351 (append (nth 1 method) (list tag def))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2352 (list store-temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2353 (list 'let (list (list (car (nth 2 method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2354 (list 'cl-set-getf (nth 4 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2355 tag-temp store-temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2356 (nth 3 method) store-temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2357 (list 'getf (nth 4 method) tag-temp def-temp))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2358
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2359 (define-setf-method substring (place from &optional to)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2360 (let ((method (get-setf-method place cl-macro-environment))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2361 (from-temp (gensym "--substring-from--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2362 (to-temp (gensym "--substring-to--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2363 (store-temp (gensym "--substring-store--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2364 (list (append (car method) (list from-temp to-temp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2365 (append (nth 1 method) (list from to))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2366 (list store-temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2367 (list 'let (list (list (car (nth 2 method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2368 (list 'cl-set-substring (nth 4 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2369 from-temp to-temp store-temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2370 (nth 3 method) store-temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2371 (list 'substring (nth 4 method) from-temp to-temp))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2372
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2373 ;; XEmacs addition
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2374 (define-setf-method values (&rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2375 (let ((methods (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2376 (get-setf-method x cl-macro-environment))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2377 args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2378 (store-temp (gensym "--values-store--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2379 (list (apply 'append (mapcar 'first methods))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2380 (apply 'append (mapcar 'second methods))
4677
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2381 `((,store-temp
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2382 (multiple-value-list-internal 0 ,(if args (length args) 1))))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2383 (cons 'values
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2384 (mapcar #'(lambda (m)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2385 (cl-setf-do-store (cons (car (third m)) (fourth m))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2386 (list 'pop store-temp)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2387 methods))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2388 (cons 'list (mapcar 'fifth methods)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2389
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2390 ;;; Getting and optimizing setf-methods.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2391 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2392 (defun get-setf-method (place &optional env)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2393 "Return a list of five values describing the setf-method for PLACE.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2394 PLACE may be any Lisp form which can appear as the PLACE argument to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2395 a macro like `setf' or `incf'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2396 (if (symbolp place)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2397 (let ((temp (gensym "--setf--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2398 (list nil nil (list temp) (list 'setq place temp) place))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2399 (or (and (symbolp (car place))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2400 (let* ((func (car place))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2401 (name (symbol-name func))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2402 (method (get func 'setf-method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2403 (case-fold-search nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2404 (or (and method
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2405 (let ((cl-macro-environment env))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2406 (setq method (apply method (cdr place))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2407 (if (and (consp method) (= (length method) 5))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2408 method
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2409 (error "Setf-method for %s returns malformed method"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2410 func)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2411 (and (save-match-data
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2412 (string-match "\\`c[ad][ad][ad]?[ad]?r\\'" name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2413 (get-setf-method (compiler-macroexpand place)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2414 (and (eq func 'edebug-after)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2415 (get-setf-method (nth (1- (length place)) place)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2416 env)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2417 (if (eq place (setq place (macroexpand place env)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2418 (if (and (symbolp (car place)) (fboundp (car place))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2419 (symbolp (symbol-function (car place))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2420 (get-setf-method (cons (symbol-function (car place))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2421 (cdr place)) env)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2422 (error "No setf-method known for %s" (car place)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2423 (get-setf-method place env)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2424
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2425 (defun cl-setf-do-modify (place opt-expr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2426 (let* ((method (get-setf-method place cl-macro-environment))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2427 (temps (car method)) (values (nth 1 method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2428 (lets nil) (subs nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2429 (optimize (and (not (eq opt-expr 'no-opt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2430 (or (and (not (eq opt-expr 'unsafe))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2431 (cl-safe-expr-p opt-expr))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2432 (cl-setf-simple-store-p (car (nth 2 method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2433 (nth 3 method)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2434 (simple (and optimize (consp place) (cl-simple-exprs-p (cdr place)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2435 (while values
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2436 (if (or simple (cl-const-expr-p (car values)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2437 (push (cons (pop temps) (pop values)) subs)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2438 (push (list (pop temps) (pop values)) lets)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2439 (list (nreverse lets)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2440 (cons (car (nth 2 method)) (sublis subs (nth 3 method)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2441 (sublis subs (nth 4 method)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2442
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2443 (defun cl-setf-do-store (spec val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2444 (let ((sym (car spec))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2445 (form (cdr spec)))
4677
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2446 (if (consp sym)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2447 ;; XEmacs change, only used for implementing #'values at the moment.
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2448 (let* ((orig (copy-list sym))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2449 (intermediate (last orig))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2450 (circular-limit 32))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2451 (while (consp (car intermediate))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2452 (when (zerop circular-limit)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2453 (error 'circular-list "Form seems to contain loops"))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2454 (setq intermediate (last (car intermediate))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2455 circular-limit (1- circular-limit)))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2456 (setcdr intermediate (list val))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2457 `(let (,orig)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2458 ,form))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2459 (if (or (cl-const-expr-p val)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2460 (and (cl-simple-expr-p val)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2461 (eq (cl-expr-contains form sym) 1))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2462 (cl-setf-simple-store-p sym form))
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2463 (subst val sym form)
8f1ee2d15784 Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4607
diff changeset
2464 (list 'let (list (list sym val)) form)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2465
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2466 (defun cl-setf-simple-store-p (sym form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2467 (and (consp form) (eq (cl-expr-contains form sym) 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2468 (eq (nth (1- (length form)) form) sym)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2469 (symbolp (car form)) (fboundp (car form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2470 (not (eq (car-safe (symbol-function (car form))) 'macro))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2471
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2472 ;;; The standard modify macros.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2473 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2474 (defmacro setf (&rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2475 "(setf PLACE VAL PLACE VAL ...): set each PLACE to the value of its VAL.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2476 This is a generalized version of `setq'; the PLACEs may be symbolic
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2477 references such as (car x) or (aref x i), as well as plain symbols.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2478 For example, (setf (cadar x) y) is equivalent to (setcar (cdar x) y).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2479 The return value is the last VAL in the list."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2480 (if (cdr (cdr args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2481 (let ((sets nil))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2482 (while args (push (list 'setf (pop args) (pop args)) sets))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2483 (cons 'progn (nreverse sets)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2484 (if (symbolp (car args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2485 (and args (cons 'setq args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2486 (let* ((method (cl-setf-do-modify (car args) (nth 1 args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2487 (store (cl-setf-do-store (nth 1 method) (nth 1 args))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2488 (if (car method) (list 'let* (car method) store) store)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2489
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2490 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2491 (defmacro psetf (&rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2492 "(psetf PLACE VAL PLACE VAL ...): set PLACEs to the values VALs in parallel.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2493 This is like `setf', except that all VAL forms are evaluated (in order)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2494 before assigning any PLACEs to the corresponding values."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2495 (let ((p args) (simple t) (vars nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2496 (while p
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2497 (if (or (not (symbolp (car p))) (cl-expr-depends-p (nth 1 p) vars))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2498 (setq simple nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2499 (if (memq (car p) vars)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2500 (error "Destination duplicated in psetf: %s" (car p)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2501 (push (pop p) vars)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2502 (or p (error "Odd number of arguments to psetf"))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2503 (pop p))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2504 (if simple
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2505 (list 'progn (cons 'setf args) nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2506 (setq args (reverse args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2507 (let ((expr (list 'setf (cadr args) (car args))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2508 (while (setq args (cddr args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2509 (setq expr (list 'setf (cadr args) (list 'prog1 (car args) expr))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2510 (list 'progn expr nil)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2511
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2512 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2513 (defun cl-do-pop (place)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2514 (if (cl-simple-expr-p place)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2515 (list 'prog1 (list 'car place) (list 'setf place (list 'cdr place)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2516 (let* ((method (cl-setf-do-modify place t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2517 (temp (gensym "--pop--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2518 (list 'let*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2519 (append (car method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2520 (list (list temp (nth 2 method))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2521 (list 'prog1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2522 (list 'car temp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2523 (cl-setf-do-store (nth 1 method) (list 'cdr temp)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2524
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2525 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2526 (defmacro remf (place tag)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
2527 "Remove TAG from property list PLACE.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2528 PLACE may be a symbol, or any generalized variable allowed by `setf'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2529 The form returns true if TAG was found and removed, nil otherwise."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2530 (let* ((method (cl-setf-do-modify place t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2531 (tag-temp (and (not (cl-const-expr-p tag)) (gensym "--remf-tag--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2532 (val-temp (and (not (cl-simple-expr-p place))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2533 (gensym "--remf-place--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2534 (ttag (or tag-temp tag))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2535 (tval (or val-temp (nth 2 method))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2536 (list 'let*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2537 (append (car method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2538 (and val-temp (list (list val-temp (nth 2 method))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2539 (and tag-temp (list (list tag-temp tag))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2540 (list 'if (list 'eq ttag (list 'car tval))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2541 (list 'progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2542 (cl-setf-do-store (nth 1 method) (list 'cddr tval))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2543 t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2544 (list 'cl-do-remf tval ttag)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2545
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2546 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2547 (defmacro shiftf (place &rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2548 "(shiftf PLACE PLACE... VAL): shift left among PLACEs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2549 Example: (shiftf A B C) sets A to B, B to C, and returns the old A.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2550 Each PLACE may be a symbol, or any generalized variable allowed by `setf'."
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2551 ;; XEmacs change: use iteration instead of recursion
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2552 (if (not (memq nil (mapcar 'symbolp (butlast (cons place args)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2553 (list* 'prog1 place
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2554 (let ((sets nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2555 (while args
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2556 (push (list 'setq place (car args)) sets)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2557 (setq place (pop args)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2558 (nreverse sets)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2559 (let* ((places (reverse (cons place args)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2560 (form (pop places)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2561 (while places
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2562 (let ((method (cl-setf-do-modify (pop places) 'unsafe)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2563 (setq form (list 'let* (car method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2564 (list 'prog1 (nth 2 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2565 (cl-setf-do-store (nth 1 method) form))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2566 form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2567
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2568 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2569 (defmacro rotatef (&rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2570 "(rotatef PLACE...): rotate left among PLACEs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2571 Example: (rotatef A B C) sets A to B, B to C, and C to A. It returns nil.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2572 Each PLACE may be a symbol, or any generalized variable allowed by `setf'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2573 (if (not (memq nil (mapcar 'symbolp args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2574 (and (cdr args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2575 (let ((sets nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2576 (first (car args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2577 (while (cdr args)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2578 (setq sets (nconc sets (list (pop args) (car args)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2579 (nconc (list 'psetf) sets (list (car args) first))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2580 (let* ((places (reverse args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2581 (temp (gensym "--rotatef--"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2582 (form temp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2583 (while (cdr places)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2584 (let ((method (cl-setf-do-modify (pop places) 'unsafe)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2585 (setq form (list 'let* (car method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2586 (list 'prog1 (nth 2 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2587 (cl-setf-do-store (nth 1 method) form))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2588 (let ((method (cl-setf-do-modify (car places) 'unsafe)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2589 (list 'let* (append (car method) (list (list temp (nth 2 method))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2590 (cl-setf-do-store (nth 1 method) form) nil)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2591
4742
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2592 ;; This function is not in Common Lisp, and there are gaps in its structure and
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2593 ;; implementation that reflect that it was never well-specified. E.g. with
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2594 ;; setf, the question of whether a PLACE is bound or not and how to make it
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2595 ;; unbound doesn't arise, but we need some way of specifying that for letf to
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2596 ;; be sensible for gethash, symbol-value and so on; currently we just hard-code
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2597 ;; symbol-value, symbol-function and values (the latter is XEmacs work that
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2598 ;; I've just done) in the body of this function, and the following gives the
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2599 ;; wrong behaviour for gethash:
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2600 ;;
4820
e6dec75ded0e Use keywords, not ordinary symbols, in the structure syntax for hash tables.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4810
diff changeset
2601 ;; (setq my-hash-table #s(hash-table :test equal :data ())
4742
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2602 ;; print-gensym t)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2603 ;; => t
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2604 ;; (gethash "my-key" my-hash-table (gensym))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2605 ;; => #:G68010
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2606 ;; (letf (((gethash "my-key" my-hash-table) 4000))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2607 ;; (message "key value is %S" (gethash "my-key" my-hash-table)))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2608 ;; => "key value is 4000"
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2609 ;; (gethash "my-key" my-hash-table (gensym))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2610 ;; => nil ;; should be an uninterned symbol.
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2611 ;;
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2612 ;; Aidan Kehoe, Fr Nov 13 16:12:21 GMT 2009
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2613
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2614 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2615 (defmacro letf (bindings &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2616 "(letf ((PLACE VALUE) ...) BODY...): temporarily bind to PLACEs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2617 This is the analogue of `let', but with generalized variables (in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2618 sense of `setf') for the PLACEs. Each PLACE is set to the corresponding
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2619 VALUE, then the BODY forms are executed. On exit, either normally or
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2620 because of a `throw' or error, the PLACEs are set back to their original
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2621 values. Note that this macro is *not* available in Common Lisp.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2622 As a special case, if `(PLACE)' is used instead of `(PLACE VALUE)',
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2623 the PLACE is not modified before executing BODY."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2624 (if (and (not (cdr bindings)) (cdar bindings) (symbolp (caar bindings)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2625 (list* 'let bindings body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2626 (let ((lets nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2627 (rev (reverse bindings)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2628 (while rev
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2629 (let* ((place (if (symbolp (caar rev))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2630 (list 'symbol-value (list 'quote (caar rev)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2631 (caar rev)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2632 (value (cadar rev))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2633 (method (cl-setf-do-modify place 'no-opt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2634 (save (gensym "--letf-save--"))
4742
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2635 (bound (and (memq (car place)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2636 '(symbol-value symbol-function values))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2637 (gensym "--letf-bound--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2638 (temp (and (not (cl-const-expr-p value)) (cdr bindings)
4742
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2639 (gensym "--letf-val--")))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2640 (syms (and (eq 'values (car place))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2641 (gensym "--letf-syms--")))
4783
e29fcfd8df5f Eliminate most core code byte-compile warnings.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4742
diff changeset
2642 (cursor (and syms (gensym "--letf-cursor--"))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2643 (setq lets (nconc (car method)
4742
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2644 (cond
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2645 (syms
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2646 `((,syms ',(loop
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2647 for sym in (cdr place)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2648 nconc (if (symbolp sym) (list sym))))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2649 (,cursor ,syms)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2650 (,bound nil)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2651 (,save
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2652 (prog2
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2653 (while (consp ,cursor)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2654 (setq ,bound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2655 (cons (and (boundp (car ,cursor))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2656 (symbol-value
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2657 (car ,cursor)))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2658 ,bound)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2659 ,cursor (cdr ,cursor)))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2660 ;; Just using ,bound as a temporary
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2661 ;; variable here, to initialise ,save:
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2662 (nreverse ,bound)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2663 ;; Now, really initialise ,bound:
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2664 (setq ,cursor ,syms
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2665 ,bound nil
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2666 ,bound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2667 (progn (while (consp ,cursor)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2668 (setq ,bound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2669 (cons
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2670 (boundp (car ,cursor))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2671 ,bound)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2672 ,cursor (cdr ,cursor)))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2673 (nreverse ,bound)))))))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2674 (bound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2675 (list (list bound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2676 (list (if (eq (car place)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2677 'symbol-value)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2678 'boundp 'fboundp)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2679 (nth 1 (nth 2 method))))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2680 (list save (list 'and bound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2681 (nth 2 method)))))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2682 (t
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2683 (list (list save (nth 2 method)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2684 (and temp (list (list temp value)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2685 lets)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2686 body (list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2687 (list 'unwind-protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2688 (cons 'progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2689 (if (cdr (car rev))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2690 (cons (cl-setf-do-store (nth 1 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2691 (or temp value))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2692 body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2693 body))
4742
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2694 (cond
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2695 (syms
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2696 `(while (consp ,syms)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2697 (if (car ,bound)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2698 (set (car ,syms) (car ,save))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2699 (makunbound (car ,syms)))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2700 (setq ,syms (cdr ,syms)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2701 ,bound (cdr ,bound)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2702 ,save (cdr ,save))))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2703 (bound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2704 (list 'if bound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2705 (cl-setf-do-store (nth 1 method) save)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2706 (list (if (eq (car place)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2707 'symbol-function)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2708 'fmakunbound
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2709 'makunbound)
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2710 (nth 1 (nth 2 method)))))
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2711 (t
4cf435fcebbc Make #'letf not error if handed a #'values form.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4723
diff changeset
2712 (cl-setf-do-store (nth 1 method) save)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2713 rev (cdr rev))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2714 (list* 'let* lets body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2715
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2716 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2717 (defmacro letf* (bindings &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2718 "(letf* ((PLACE VALUE) ...) BODY...): temporarily bind to PLACEs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2719 This is the analogue of `let*', but with generalized variables (in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2720 sense of `setf') for the PLACEs. Each PLACE is set to the corresponding
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2721 VALUE, then the BODY forms are executed. On exit, either normally or
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2722 because of a `throw' or error, the PLACEs are set back to their original
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2723 values. Note that this macro is *not* available in Common Lisp.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2724 As a special case, if `(PLACE)' is used instead of `(PLACE VALUE)',
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2725 the PLACE is not modified before executing BODY."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2726 (if (null bindings)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2727 (cons 'progn body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2728 (setq bindings (reverse bindings))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2729 (while bindings
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2730 (setq body (list (list* 'letf (list (pop bindings)) body))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2731 (car body)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2732
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2733 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2734 (defmacro callf (func place &rest args)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
2735 "Set PLACE to (FUNC PLACE ARGS...).
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2736 FUNC should be an unquoted function name. PLACE may be a symbol,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2737 or any generalized variable allowed by `setf'."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2738 (let* ((method (cl-setf-do-modify place (cons 'list args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2739 (rargs (cons (nth 2 method) args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2740 (list 'let* (car method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2741 (cl-setf-do-store (nth 1 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2742 (if (symbolp func) (cons func rargs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2743 (list* 'funcall (list 'function func)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2744 rargs))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2745
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2746 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2747 (defmacro callf2 (func arg1 place &rest args)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
2748 "Set PLACE to (FUNC ARG1 PLACE ARGS...).
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2749 Like `callf', but PLACE is the second argument of FUNC, not the first."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2750 (if (and (cl-safe-expr-p arg1) (cl-simple-expr-p place) (symbolp func))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2751 (list 'setf place (list* func arg1 place args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2752 (let* ((method (cl-setf-do-modify place (cons 'list args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2753 (temp (and (not (cl-const-expr-p arg1)) (gensym "--arg1--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2754 (rargs (list* (or temp arg1) (nth 2 method) args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2755 (list 'let* (append (and temp (list (list temp arg1))) (car method))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2756 (cl-setf-do-store (nth 1 method)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2757 (if (symbolp func) (cons func rargs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2758 (list* 'funcall (list 'function func)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2759 rargs)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2760
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2761 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2762 (defmacro define-modify-macro (name arglist func &optional doc)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
2763 "Define a `setf'-like modify macro.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2764 If NAME is called, it combines its PLACE argument with the other arguments
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2765 from ARGLIST using FUNC: (define-modify-macro incf (&optional (n 1)) +)"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2766 (if (memq '&key arglist) (error "&key not allowed in define-modify-macro"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2767 (let ((place (gensym "--place--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2768 (list 'defmacro* name (cons place arglist) doc
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2769 (list* (if (memq '&rest arglist) 'list* 'list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2770 '(quote callf) (list 'quote func) place
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2771 (cl-arglist-args arglist)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2772
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2773
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2774 ;;; Structures.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2775
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2776 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2777 (defmacro defstruct (struct &rest descs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2778 "(defstruct (NAME OPTIONS...) (SLOT SLOT-OPTS...)...): define a struct type.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2779 This macro defines a new Lisp data type called NAME, which contains data
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2780 stored in SLOTs. This defines a `make-NAME' constructor, a `copy-NAME'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2781 copier, a `NAME-p' predicate, and setf-able `NAME-SLOT' accessors."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2782 (let* ((name (if (consp struct) (car struct) struct))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2783 (opts (cdr-safe struct))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2784 (slots nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2785 (defaults nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2786 (conc-name (concat (symbol-name name) "-"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2787 (constructor (intern (format "make-%s" name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2788 (constrs nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2789 (copier (intern (format "copy-%s" name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2790 (predicate (intern (format "%s-p" name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2791 (print-func nil) (print-auto nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2792 (safety (if (cl-compiling-file) cl-optimize-safety 3))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2793 (include nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2794 (tag (intern (format "cl-struct-%s" name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2795 (tag-symbol (intern (format "cl-struct-%s-tags" name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2796 (include-descs nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2797 (side-eff nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2798 (type nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2799 (named nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2800 (forms nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2801 pred-form pred-check)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2802 (if (stringp (car descs))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2803 (push (list 'put (list 'quote name) '(quote structure-documentation)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2804 (pop descs)) forms))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2805 (setq descs (cons '(cl-tag-slot)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2806 (mapcar #'(lambda (x) (if (consp x) x (list x)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2807 descs)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2808 (while opts
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2809 (let ((opt (if (consp (car opts)) (caar opts) (car opts)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2810 (args (cdr-safe (pop opts))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2811 (cond ((eq opt :conc-name)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2812 (if args
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2813 (setq conc-name (if (car args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2814 (symbol-name (car args)) ""))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2815 ((eq opt :constructor)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2816 (if (cdr args)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2817 (push args constrs)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2818 (if args (setq constructor (car args)))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2819 ((eq opt :copier)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2820 (if args (setq copier (car args))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2821 ((eq opt :predicate)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2822 (if args (setq predicate (car args))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2823 ((eq opt :include)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2824 (setq include (car args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2825 include-descs (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2826 (if (consp x) x (list x)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2827 (cdr args))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2828 ((eq opt :print-function)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2829 (setq print-func (car args)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2830 ((eq opt :type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2831 (setq type (car args)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2832 ((eq opt :named)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2833 (setq named t))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2834 ((eq opt :initial-offset)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2835 (setq descs (nconc (make-list (car args) '(cl-skip-slot))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2836 descs)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2837 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2838 (error "Slot option %s unrecognized" opt)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2839 (if print-func
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2840 (setq print-func (list 'progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2841 (list 'funcall (list 'function print-func)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2842 'cl-x 'cl-s 'cl-n) t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2843 (or type (and include (not (get include 'cl-struct-print)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2844 (setq print-auto t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2845 print-func (and (or (not (or include type)) (null print-func))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2846 (list 'progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2847 (list 'princ (format "#S(%s" name)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2848 'cl-s))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2849 (if include
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2850 (let ((inc-type (get include 'cl-struct-type))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2851 (old-descs (get include 'cl-struct-slots)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2852 (or inc-type (error "%s is not a struct name" include))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2853 (and type (not (eq (car inc-type) type))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2854 (error ":type disagrees with :include for %s" name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2855 (while include-descs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2856 (setcar (memq (or (assq (caar include-descs) old-descs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2857 (error "No slot %s in included struct %s"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2858 (caar include-descs) include))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2859 old-descs)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2860 (pop include-descs)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2861 (setq descs (append old-descs (delq (assq 'cl-tag-slot descs) descs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2862 type (car inc-type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2863 named (assq 'cl-tag-slot descs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2864 (if (cadr inc-type) (setq tag name named t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2865 (let ((incl include))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2866 (while incl
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2867 (push (list 'pushnew (list 'quote tag)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2868 (intern (format "cl-struct-%s-tags" incl)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2869 forms)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2870 (setq incl (get incl 'cl-struct-include)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2871 (if type
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2872 (progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2873 (or (memq type '(vector list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2874 (error "Illegal :type specifier: %s" type))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2875 (if named (setq tag name)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2876 (setq type 'vector named 'true)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2877 (or named (setq descs (delq (assq 'cl-tag-slot descs) descs)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2878 (push (list 'defvar tag-symbol) forms)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2879 (setq pred-form (and named
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2880 (let ((pos (- (length descs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2881 (length (memq (assq 'cl-tag-slot descs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2882 descs)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2883 (if (eq type 'vector)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2884 (list 'and '(vectorp cl-x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2885 (list '>= '(length cl-x) (length descs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2886 (list 'memq (list 'aref 'cl-x pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2887 tag-symbol))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2888 (if (= pos 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2889 (list 'memq '(car-safe cl-x) tag-symbol)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2890 (list 'and '(consp cl-x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2891 (list 'memq (list 'nth pos 'cl-x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2892 tag-symbol))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2893 pred-check (and pred-form (> safety 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2894 (if (and (eq (caadr pred-form) 'vectorp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2895 (= safety 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2896 (cons 'and (cdddr pred-form)) pred-form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2897 (let ((pos 0) (descp descs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2898 (while descp
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2899 (let* ((desc (pop descp))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2900 (slot (car desc)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2901 (if (memq slot '(cl-tag-slot cl-skip-slot))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2902 (progn
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2903 (push nil slots)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2904 (push (and (eq slot 'cl-tag-slot) (list 'quote tag))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2905 defaults))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2906 (if (assq slot descp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2907 (error "Duplicate slots named %s in %s" slot name))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2908 (let ((accessor (intern (format "%s%s" conc-name slot))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2909 (push slot slots)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2910 (push (nth 1 desc) defaults)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2911 (push (list*
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2912 'defsubst* accessor '(cl-x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2913 (append
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2914 (and pred-check
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2915 (list (list 'or pred-check
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2916 (list 'error
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2917 (format "%s accessing a non-%s"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2918 accessor name)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2919 'cl-x))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2920 (list (if (eq type 'vector) (list 'aref 'cl-x pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2921 (if (= pos 0) '(car cl-x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2922 (list 'nth pos 'cl-x)))))) forms)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2923 (push (cons accessor t) side-eff)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2924 (push (list 'define-setf-method accessor '(cl-x)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2925 (if (cadr (memq :read-only (cddr desc)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2926 (list 'error (format "%s is a read-only slot"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2927 accessor))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2928 (list 'cl-struct-setf-expander 'cl-x
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2929 (list 'quote name) (list 'quote accessor)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2930 (and pred-check (list 'quote pred-check))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2931 pos)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2932 forms)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2933 (if print-auto
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2934 (nconc print-func
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2935 (list (list 'princ (format " %s" slot) 'cl-s)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2936 (list 'prin1 (list accessor 'cl-x) 'cl-s)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2937 (setq pos (1+ pos))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2938 (setq slots (nreverse slots)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2939 defaults (nreverse defaults))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2940 (and predicate pred-form
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2941 (progn (push (list 'defsubst* predicate '(cl-x)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2942 (if (eq (car pred-form) 'and)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2943 (append pred-form '(t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2944 (list 'and pred-form t))) forms)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2945 (push (cons predicate 'error-free) side-eff)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2946 (and copier
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2947 (progn (push (list 'defun copier '(x) '(copy-sequence x)) forms)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2948 (push (cons copier t) side-eff)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2949 (if constructor
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2950 (push (list constructor
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2951 (cons '&key (delq nil (copy-sequence slots))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2952 constrs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2953 (while constrs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2954 (let* ((name (caar constrs))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2955 (args (cadr (pop constrs)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2956 (anames (cl-arglist-args args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2957 (make (mapcar* #'(lambda (s d) (if (memq s anames) s d))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2958 slots defaults)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2959 (push (list 'defsubst* name
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2960 (list* '&cl-defs (list 'quote (cons nil descs)) args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2961 (cons type make)) forms)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2962 (if (cl-safe-expr-p (cons 'progn (mapcar 'second descs)))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2963 (push (cons name t) side-eff))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2964 (if print-auto (nconc print-func (list '(princ ")" cl-s) t)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2965 (if print-func
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2966 (push (list 'push
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2967 (list 'function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2968 (list 'lambda '(cl-x cl-s cl-n)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2969 (list 'and pred-form print-func)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2970 'custom-print-functions) forms))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2971 (push (list 'setq tag-symbol (list 'list (list 'quote tag))) forms)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
2972 (push (list* 'eval-when '(compile load eval)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2973 (list 'put (list 'quote name) '(quote cl-struct-slots)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2974 (list 'quote descs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2975 (list 'put (list 'quote name) '(quote cl-struct-type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2976 (list 'quote (list type (eq named t))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2977 (list 'put (list 'quote name) '(quote cl-struct-include)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2978 (list 'quote include))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2979 (list 'put (list 'quote name) '(quote cl-struct-print)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2980 print-auto)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2981 (mapcar #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2982 (list 'put (list 'quote (car x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2983 '(quote side-effect-free)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2984 (list 'quote (cdr x))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2985 side-eff))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2986 forms)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2987 (cons 'progn (nreverse (cons (list 'quote name) forms)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2988
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2989 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2990 (defun cl-struct-setf-expander (x name accessor pred-form pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2991 (let* ((temp (gensym "--x--")) (store (gensym "--store--")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2992 (list (list temp) (list x) (list store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2993 (append '(progn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2994 (and pred-form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2995 (list (list 'or (subst temp 'cl-x pred-form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2996 (list 'error
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2997 (format
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2998 "%s storing a non-%s" accessor name)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2999 temp))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3000 (list (if (eq (car (get name 'cl-struct-type)) 'vector)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3001 (list 'aset temp pos store)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3002 (list 'setcar
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3003 (if (<= pos 5)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3004 (let ((xx temp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3005 (while (>= (setq pos (1- pos)) 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3006 (setq xx (list 'cdr xx)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3007 xx)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3008 (list 'nthcdr pos temp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3009 store))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3010 (list accessor temp))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3011
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3012
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3013 ;;; Types and assertions.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3014
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3015 ;;;###autoload
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3016 (defmacro deftype (name arglist &rest body)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
3017 "Define NAME as a new data type.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3018 The type name can then be used in `typecase', `check-type', etc."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3019 (list 'eval-when '(compile load eval)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3020 (cl-transform-function-property
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3021 name 'cl-deftype-handler (cons (list* '&cl-defs ''('*) arglist) body))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3022
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3023 (defun cl-make-type-test (val type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3024 (if (symbolp type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3025 (cond ((get type 'cl-deftype-handler)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3026 (cl-make-type-test val (funcall (get type 'cl-deftype-handler))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3027 ((memq type '(nil t)) type)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3028 ((eq type 'null) `(null ,val))
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3029 ((eq type 'float) `(floatp ,val))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3030 ((eq type 'real) `(numberp ,val))
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3031 ((eq type 'fixnum) `(fixnump ,val))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3032 ;; XEmacs change: we do not have char-valid-p
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3033 ((memq type '(character string-char)) `(characterp ,val))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3034 (t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3035 (let* ((name (symbol-name type))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3036 (namep (intern (concat name "p"))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3037 (if (fboundp namep) (list namep val)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3038 (list (intern (concat name "-p")) val)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3039 (cond ((get (car type) 'cl-deftype-handler)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3040 (cl-make-type-test val (apply (get (car type) 'cl-deftype-handler)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3041 (cdr type))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3042 ((memq (car-safe type) '(integer float real number))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3043 (delq t (list 'and (cl-make-type-test val (car type))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3044 (if (memq (cadr type) '(* nil)) t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3045 (if (consp (cadr type)) (list '> val (caadr type))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3046 (list '>= val (cadr type))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3047 (if (memq (caddr type) '(* nil)) t
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3048 (if (consp (caddr type)) (list '< val (caaddr type))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3049 (list '<= val (caddr type)))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3050 ((memq (car-safe type) '(and or not))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3051 (cons (car type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3052 (mapcar #'(lambda (x) (cl-make-type-test val x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3053 (cdr type))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3054 ((memq (car-safe type) '(member member*))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3055 (list 'and (list 'member* val (list 'quote (cdr type))) t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3056 ((eq (car-safe type) 'satisfies) (list (cadr type) val))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3057 (t (error "Bad type spec: %s" type)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3058
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3059 ;;;###autoload
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
3060 (defun typep (object type) ; See compiler macro below.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3061 "Check that OBJECT is of type TYPE.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3062 TYPE is a Common Lisp-style type specifier."
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
3063 (eval (cl-make-type-test 'object type)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3064
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3065 ;;;###autoload
446
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
3066 (defmacro check-type (place type &optional string)
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
3067 "Verify that PLACE is of type TYPE; signal a continuable error if not.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3068 STRING is an optional description of the desired type."
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3069 (and (or (not (cl-compiling-file))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3070 (< cl-optimize-speed 3) (= cl-optimize-safety 3))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3071 (let* ((temp (if (cl-simple-expr-p place 3) place (gensym)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3072 (test (cl-make-type-test temp type))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3073 (signal-error `(signal 'wrong-type-argument
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3074 ,(list 'list (or string (list 'quote type))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3075 temp (list 'quote place))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3076 (body
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3077 (condition-case nil
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3078 `(while (not ,test)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3079 ,(macroexpand `(setf ,place ,signal-error)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3080 (error
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3081 `(if ,test (progn ,signal-error nil))))))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3082 (if (eq temp place) `(progn ,body nil)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3083 `(let ((,temp ,place)) ,body nil)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3084
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3085 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3086 (defmacro assert (form &optional show-args string &rest args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3087 "Verify that FORM returns non-nil; signal an error if not.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3088 Second arg SHOW-ARGS means to include arguments of FORM in message.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3089 Other args STRING and ARGS... are arguments to be passed to `error'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3090 They are not evaluated unless the assertion fails. If STRING is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3091 omitted, a default message listing FORM itself is used."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3092 (and (or (not (cl-compiling-file))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3093 (< cl-optimize-speed 3) (= cl-optimize-safety 3))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3094 (let ((sargs (and show-args (delq nil (mapcar
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3095 #'(lambda (x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3096 (and (not (cl-const-expr-p x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3097 x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3098 (cdr form))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3099 (list 'progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3100 (list 'or form
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3101 (if string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3102 (list* 'error string (append sargs args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3103 (list 'signal '(quote cl-assertion-failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3104 (list* 'list (list 'quote form) sargs))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3105 nil))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3106
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3107 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3108 (defmacro ignore-errors (&rest body)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3109 "Execute BODY; if an error occurs, return nil.
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3110 Otherwise, return result of last form in BODY."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3111 `(condition-case nil (progn ,@body) (error nil)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3112
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3113 ;; XEmacs addition
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3114 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3115 (defmacro ignore-file-errors (&rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3116 "Execute FORMS; if an error of type `file-error' occurs, return nil.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3117 Otherwise, return result of last FORM."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3118 `(condition-case nil (progn ,@body) (file-error nil)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3119
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3120
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3121 ;;; Compiler macros.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3122
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3123 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3124 (defmacro define-compiler-macro (func args &rest body)
4695
fee33ab25966 Add arglist info for autoloaded functions and macros.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4694
diff changeset
3125 "Define a compiler-only macro.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3126 This is like `defmacro', but macro expansion occurs only if the call to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3127 FUNC is compiled (i.e., not interpreted). Compiler macros should be used
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3128 for optimizing the way calls to FUNC are compiled; the form returned by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3129 BODY should do the same thing as a call to the normal function called
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3130 FUNC, though possibly more efficiently. Note that, like regular macros,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3131 compiler macros are expanded repeatedly until no further expansions are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3132 possible. Unlike regular macros, BODY can decide to \"punt\" and leave the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3133 original function call alone by declaring an initial `&whole foo' parameter
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3134 and then returning foo."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3135 (let ((p (if (listp args) args (list '&rest args))) (res nil))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3136 (while (consp p) (push (pop p) res))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3137 (setq args (nconc (nreverse res) (and p (list '&rest p)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3138 (list 'eval-when '(compile load eval)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3139 (cl-transform-function-property
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3140 func 'cl-compiler-macro
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3141 (cons (if (memq '&whole args) (delq '&whole args)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3142 (cons '--cl-whole-arg-- args)) body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3143 (list 'or (list 'get (list 'quote func) '(quote byte-compile))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3144 (list 'put (list 'quote func) '(quote byte-compile)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3145 '(quote cl-byte-compile-compiler-macro)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3146
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3147 ;;;###autoload
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3148 (defun compiler-macroexpand (form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3149 (while
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3150 (let ((func (car-safe form)) (handler nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3151 (while (and (symbolp func)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3152 (not (setq handler (get func 'cl-compiler-macro)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3153 (fboundp func)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3154 (or (not (eq (car-safe (symbol-function func)) 'autoload))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3155 (load (nth 1 (symbol-function func)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3156 (setq func (symbol-function func)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3157 (and handler
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3158 (not (eq form (setq form (apply handler form (cdr form))))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3159 form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3160
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3161 (defun cl-byte-compile-compiler-macro (form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3162 (if (eq form (setq form (compiler-macroexpand form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3163 (byte-compile-normal-call form)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3164 (byte-compile-form form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3165
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3166 (defmacro defsubst* (name args &rest body)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3167 "(defsubst* NAME ARGLIST [DOCSTRING] BODY...): define NAME as a function.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3168 Like `defun', except the function is automatically declared `inline',
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3169 ARGLIST allows full Common Lisp conventions, and BODY is implicitly
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3170 surrounded by (block NAME ...)."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3171 (let* ((argns (cl-arglist-args args)) (p argns)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3172 (pbody (cons 'progn body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3173 (unsafe (not (cl-safe-expr-p pbody))))
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3174 (while (and p (eq (cl-expr-contains args (car p)) 1)) (pop p))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3175 (list 'progn
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3176 (if p nil ; give up if defaults refer to earlier args
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3177 (list 'define-compiler-macro name
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3178 (if (memq '&key args)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3179 (list* '&whole 'cl-whole '&cl-quote args)
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3180 (cons '&cl-quote args))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3181 (list* 'cl-defsubst-expand (list 'quote argns)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3182 (list 'quote (list* 'block name body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3183 (not (or unsafe (cl-expr-access-order pbody argns)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3184 (and (memq '&key args) 'cl-whole) unsafe argns)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3185 (list* 'defun* name args body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3186
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3187 (defun cl-defsubst-expand (argns body simple whole unsafe &rest argvs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3188 (if (and whole (not (cl-safe-expr-p (cons 'progn argvs)))) whole
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3189 (if (cl-simple-exprs-p argvs) (setq simple t))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3190 (let ((lets (delq nil
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3191 (mapcar* #'(lambda (argn argv)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3192 (if (or simple (cl-const-expr-p argv))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3193 (progn (setq body (subst argv argn body))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3194 (and unsafe (list argn argv)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3195 (list argn argv)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3196 argns argvs))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3197 (if lets (list 'let lets body) body))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3198
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3199
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3200 ;;; Compile-time optimizations for some functions defined in this package.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3201 ;;; Note that cl.el arranges to force cl-macs to be loaded at compile-time,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3202 ;;; mainly to make sure these macros will be present.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3203
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3204 (put 'eql 'byte-compile nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3205 (define-compiler-macro eql (&whole form a b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3206 (cond ((eq (cl-const-expr-p a) t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3207 (let ((val (cl-const-expr-val a)))
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3208 (if (and (numberp val) (not (fixnump val)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3209 (list 'equal a b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3210 (list 'eq a b))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3211 ((eq (cl-const-expr-p b) t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3212 (let ((val (cl-const-expr-val b)))
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3213 (if (and (numberp val) (not (fixnump val)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3214 (list 'equal a b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3215 (list 'eq a b))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3216 ((cl-simple-expr-p a 5)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3217 (list 'if (list 'numberp a)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3218 (list 'equal a b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3219 (list 'eq a b)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3220 ((and (cl-safe-expr-p a)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3221 (cl-simple-expr-p b 5))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3222 (list 'if (list 'numberp b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3223 (list 'equal a b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3224 (list 'eq a b)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3225 (t form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3226
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3227 (define-compiler-macro member* (&whole form a list &rest keys)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3228 (let ((test (and (= (length keys) 2) (eq (car keys) :test)
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3229 (cl-const-expr-val (nth 1 keys))))
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3230 a-val)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3231 (cond ((eq test 'eq) (list 'memq a list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3232 ((eq test 'equal) (list 'member a list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3233 ((or (null keys) (eq test 'eql))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3234 (if (eq (cl-const-expr-p a) t)
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3235 (list (if (and (numberp (setq a-val (cl-const-expr-val a)))
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3236 (not (fixnump a-val)))
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3237 'member
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3238 'memq)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3239 a list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3240 (if (eq (cl-const-expr-p list) t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3241 (let ((p (cl-const-expr-val list)) (mb nil) (mq nil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3242 (if (not (cdr p))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3243 (and p (list 'eql a (list 'quote (car p))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3244 (while p
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3245 (if (and (numberp (car p)) (not (fixnump (car p))))
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3246 (setq mb t)
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3247 (or (fixnump (car p)) (symbolp (car p)) (setq mq t)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3248 (setq p (cdr p)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3249 (if (not mb) (list 'memq a list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3250 (if (not mq) (list 'member a list) form))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3251 form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3252 (t form))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3253
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3254 (define-compiler-macro assoc* (&whole form a list &rest keys)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3255 (let ((test (and (= (length keys) 2) (eq (car keys) :test)
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3256 (cl-const-expr-val (nth 1 keys))))
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3257 a-val)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3258 (cond ((eq test 'eq) (list 'assq a list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3259 ((eq test 'equal) (list 'assoc a list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3260 ((and (eq (cl-const-expr-p a) t) (or (null keys) (eq test 'eql)))
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3261 (if (and (numberp (setq a-val (cl-const-expr-val a)))
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3262 (not (fixnump a-val)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3263 (list 'assoc a list) (list 'assq a list)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3264 (t form))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3265
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3266 (define-compiler-macro adjoin (&whole form a list &rest keys)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3267 (if (and (cl-simple-expr-p a) (cl-simple-expr-p list)
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3268 (not (memq :key keys)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3269 (list 'if (list* 'member* a list keys) list (list 'cons a list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3270 form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3271
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3272 (define-compiler-macro list* (arg &rest others)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3273 (let* ((args (reverse (cons arg others)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3274 (form (car args)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3275 (while (setq args (cdr args))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3276 (setq form (list 'cons (car args) form)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3277 form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3278
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3279 ;; XEmacs change: our builtin get takes the default argument
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 428
diff changeset
3280 (define-compiler-macro get* (sym prop &optional default)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 428
diff changeset
3281 (list 'get sym prop default))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3282
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3283 (define-compiler-macro getf (sym prop &optional default)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3284 (list 'plist-get sym prop default))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3285
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3286 (define-compiler-macro typep (&whole form val type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3287 (if (cl-const-expr-p type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3288 (let ((res (cl-make-type-test val (cl-const-expr-val type))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3289 (if (or (memq (cl-expr-contains res val) '(nil 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3290 (cl-simple-expr-p val)) res
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3291 (let ((temp (gensym)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3292 (list 'let (list (list temp val)) (subst temp val res)))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3293 form))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3294
4607
517f6887fbc0 Remove duplicate functions, chiefly #'delete-duplicates reimplementations.
Aidan Kehoe <kehoea@parhasard.net>
parents: 2297
diff changeset
3295 ;; XEmacs; inline delete-duplicates if it's called with a literal
517f6887fbc0 Remove duplicate functions, chiefly #'delete-duplicates reimplementations.
Aidan Kehoe <kehoea@parhasard.net>
parents: 2297
diff changeset
3296 ;; #'equal or #'eq and no other keywords, we want the speed in
517f6887fbc0 Remove duplicate functions, chiefly #'delete-duplicates reimplementations.
Aidan Kehoe <kehoea@parhasard.net>
parents: 2297
diff changeset
3297 ;; font-lock.el.
517f6887fbc0 Remove duplicate functions, chiefly #'delete-duplicates reimplementations.
Aidan Kehoe <kehoea@parhasard.net>
parents: 2297
diff changeset
3298 (define-compiler-macro delete-duplicates (&whole form cl-seq &rest cl-keys)
4707
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3299 (let ((listp-check
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3300 (if (memq (car-safe cl-seq)
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3301 ;; No need to check for a list at runtime with these. We
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3302 ;; could expand the list, but these are all the functions
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3303 ;; in the relevant context at the moment.
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3304 '(nreverse append nconc mapcan mapcar))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3305 t
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3306 '(listp begin))))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3307 (cond ((and (= 4 (length form))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3308 (eq :test (third form))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3309 (or (equal '(quote eq) (fourth form))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3310 (equal '(function eq) (fourth form))))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3311 `(let* ((begin ,cl-seq)
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3312 (cl-seq begin))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3313 (if ,listp-check
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3314 (progn
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3315 (while cl-seq
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3316 (setq cl-seq (setcdr cl-seq (delq (car cl-seq)
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3317 (cdr cl-seq)))))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3318 begin)
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3319 ;; Call cl-delete-duplicates explicitly, to avoid the form
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3320 ;; getting compiler-macroexpanded again:
4714
84f870bbd17b Fix another bug in the delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4707
diff changeset
3321 (cl-delete-duplicates begin ',cl-keys nil))))
4707
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3322 ((and (= 4 (length form))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3323 (eq :test (third form))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3324 (or (equal '(quote equal) (fourth form))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3325 (equal '(function equal) (fourth form))))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3326 `(let* ((begin ,cl-seq)
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3327 (cl-seq begin))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3328 (if ,listp-check
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3329 (progn
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3330 (while cl-seq
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3331 (setq cl-seq (setcdr cl-seq (delete (car cl-seq)
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3332 (cdr cl-seq)))))
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3333 begin)
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3334 ;; Call cl-delete-duplicates explicitly, to avoid the form
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3335 ;; getting compiler-macroexpanded again:
4714
84f870bbd17b Fix another bug in the delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4707
diff changeset
3336 (cl-delete-duplicates begin ',cl-keys nil))))
4707
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3337 (t
5bb0735f56e0 Handle non-list sequences better, delete-duplicates compiler macro.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4702
diff changeset
3338 form))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3339
4716
dca5bb2adff1 Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4714
diff changeset
3340 ;; XEmacs change, the GNU mapc doesn't accept the Common Lisp args, so this
dca5bb2adff1 Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4714
diff changeset
3341 ;; change isn't helpful.
dca5bb2adff1 Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4714
diff changeset
3342 (define-compiler-macro mapc (&whole form cl-func cl-seq &rest cl-rest)
dca5bb2adff1 Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4714
diff changeset
3343 (if cl-rest
dca5bb2adff1 Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4714
diff changeset
3344 form
dca5bb2adff1 Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4714
diff changeset
3345 (cons 'mapc-internal (cdr form))))
dca5bb2adff1 Don't cons with #'mapcar calls where the result is discarded,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4714
diff changeset
3346
4719
bd51ab22afa8 Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4716
diff changeset
3347 (define-compiler-macro mapcar* (&whole form cl-func cl-x &rest cl-rest)
bd51ab22afa8 Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4716
diff changeset
3348 (if cl-rest
bd51ab22afa8 Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4716
diff changeset
3349 form
bd51ab22afa8 Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4716
diff changeset
3350 (cons 'mapcar (cdr form))))
bd51ab22afa8 Make it possible to silence warnings issued when #'mapcar's result is discarded.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4716
diff changeset
3351
4723
ebca981a0012 If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4719
diff changeset
3352 ;; XEmacs; it's perfectly reasonable, and often much clearer to those
ebca981a0012 If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4719
diff changeset
3353 ;; reading the code, to call regexp-quote on a constant string, which is
ebca981a0012 If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4719
diff changeset
3354 ;; something we can optimise here easily.
ebca981a0012 If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4719
diff changeset
3355 (define-compiler-macro regexp-quote (&whole form string)
ebca981a0012 If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4719
diff changeset
3356 (if (stringp string)
ebca981a0012 If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4719
diff changeset
3357 (regexp-quote string)
ebca981a0012 If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4719
diff changeset
3358 form))
ebca981a0012 If STRING is constant, call regexp-quote at compile time.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4719
diff changeset
3359
4792
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3360 (define-compiler-macro equalp (&whole form x y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3361 "Expand calls to `equalp' where X or Y is a constant expression.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3362
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3363 Much of the processing that `equalp' does is dependent on the types of both
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3364 of its arguments, and with type information for one of them, we can
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3365 eliminate much of the body of the function at compile time.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3366
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3367 Where both X and Y are constant expressions, `equalp' is evaluated at
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3368 compile time by byte-optimize.el--this compiler macro passes FORM through to
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3369 the byte optimizer in those cases."
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3370 ;; Cases where both arguments are constant are handled in
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3371 ;; byte-optimize.el, we only need to handle those cases where one is
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3372 ;; constant here.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3373 (let* ((equalp-sym (eval-when-compile (gensym)))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3374 (let-form '(progn))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3375 (check-bit-vector t)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3376 (check-string t)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3377 (original-y y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3378 equalp-temp checked)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3379 (macrolet
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3380 ((unordered-check (check)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3381 `(prog1
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3382 (setq checked
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3383 (or ,check
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3384 (prog1 ,(sublis '((x . y) (y . x)) check :test #'eq)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3385 (setq equalp-temp x x y y equalp-temp))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3386 (when checked
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3387 (unless (symbolp y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3388 (setq let-form `(let ((,equalp-sym ,y))) y equalp-sym))))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3389 ;; In the bodies of the below clauses, x is always a constant expression
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3390 ;; of the type we're interested in, and y is always a symbol that refers
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3391 ;; to the result non-constant side of the comparison.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3392 (cond ((unordered-check (and (arrayp x) (not (cl-const-expr-p y))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3393 ;; Strings and other arrays. A vector containing the same
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3394 ;; character elements as a given string is equalp to that string;
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3395 ;; a bit-vector can only be equalp to a string if both are
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3396 ;; zero-length.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3397 (cond
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3398 ((member x '("" #* []))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3399 ;; No need to protect against multiple evaluation here:
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3400 `(and (member ,original-y '("" #* [])) t))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3401 ((stringp x)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3402 `(,@let-form
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3403 (if (stringp ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3404 (eq t (compare-strings ,x nil nil
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3405 ,y nil nil t))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3406 (if (vectorp ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3407 (cl-string-vector-equalp ,x ,y)))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3408 ((bit-vector-p x)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3409 `(,@let-form
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3410 (if (bit-vector-p ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3411 ;; No need to call equalp on each element here:
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3412 (equal ,x ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3413 (if (vectorp ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3414 (cl-bit-vector-vector-equalp ,x ,y)))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3415 (t
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3416 (loop
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3417 for elt across x
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3418 ;; We may not need to check the other argument if it's a
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3419 ;; string or bit vector, depending on the contents of x:
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3420 always (progn
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3421 (unless (characterp elt) (setq check-string nil))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3422 (unless (and (numberp elt) (or (= elt 0) (= elt 1)))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3423 (setq check-bit-vector nil))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3424 (or check-string check-bit-vector)))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3425 `(,@let-form
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3426 (cond
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3427 ,@(if check-string
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3428 `(((stringp ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3429 (cl-string-vector-equalp ,y ,x))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3430 ,@(if check-bit-vector
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3431 `(((bit-vector-p ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3432 (cl-bit-vector-vector-equalp ,y ,x))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3433 ((vectorp ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3434 (cl-vector-array-equalp ,x ,y)))))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3435 ((unordered-check (and (characterp x) (not (cl-const-expr-p y))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3436 `(,@let-form
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3437 (or (eq ,x ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3438 ;; eq has a bytecode, char-equal doesn't.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3439 (and (characterp ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3440 (eq (downcase ,x) (downcase ,y))))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3441 ((unordered-check (and (numberp x) (not (cl-const-expr-p y))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3442 `(,@let-form
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3443 (and (numberp ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3444 (= ,x ,y))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3445 ((unordered-check (and (hash-table-p x) (not (cl-const-expr-p y))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3446 ;; Hash tables; follow the CL spec.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3447 `(,@let-form
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3448 (and (hash-table-p ,y)
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3449 (eq ',(hash-table-test x) (hash-table-test ,y))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3450 (= ,(hash-table-count x) (hash-table-count ,y))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3451 (cl-hash-table-contents-equalp ,x ,y))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3452 ((unordered-check
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3453 ;; Symbols; eq.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3454 (and (not (cl-const-expr-p y))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3455 (or (memq x '(nil t))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3456 (and (eq (car-safe x) 'quote) (symbolp (second x))))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3457 (cons 'eq (cdr form)))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3458 ((unordered-check
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3459 ;; Compare conses at runtime, there's no real upside to
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3460 ;; unrolling the function -> they fall through to the next
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3461 ;; clause in this function.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3462 (and (cl-const-expr-p x) (not (consp x))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3463 (not (cl-const-expr-p y))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3464 ;; All other types; use equal.
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3465 (cons 'equal (cdr form)))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3466 ;; Neither side is a constant expression, do all our evaluation at
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3467 ;; runtime (or both are, and equalp will be called from
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3468 ;; byte-optimize.el).
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3469 (t form)))))
95b04754ea8c Make #'equalp more compatible with CL; add a compiler macro, test & doc it.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4783
diff changeset
3470
4810
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3471 (define-compiler-macro map (&whole form cl-type cl-func cl-seq
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3472 &rest cl-rest)
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3473 "If CL-TYPE is a constant expression that we know how to handle, transform
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3474 the call to `map' to a more efficient expression."
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3475 (cond
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3476 ;; The first two here rely on the compiler macros for mapc and mapcar*,
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3477 ;; to convert to mapc-internal and mapcar, where appropriate (that is, in
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3478 ;; the absence of cl-rest.)
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3479 ((null cl-type)
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3480 `(prog1 nil (mapc ,@(nthcdr 2 form))))
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3481 ((equal '(quote list) cl-type)
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3482 (cons 'mapcar* (nthcdr 2 form)))
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3483 ((or (equal '(quote vector) cl-type)
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3484 (equal '(quote array) cl-type))
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3485 (if cl-rest
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3486 `(vconcat (mapcar* ,@(nthcdr 2 form)))
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3487 (cons 'mapvector (nthcdr 2 form))))
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3488 ((equal '(quote string) cl-type)
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3489 `(concat (mapcar* ,@(nthcdr 2 form))))
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3490 ((equal '(quote bit-vector) cl-type)
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3491 `(bvconcat (mapcar* ,@(nthcdr 2 form))))
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3492 (t form)))
6ee5e50a8772 Add a compiler macro for #'map, where CL-TYPE is constant and understood.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4794
diff changeset
3493
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3494 (mapc
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3495 #'(lambda (y)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3496 (put (car y) 'side-effect-free t)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3497 (put (car y) 'byte-compile 'cl-byte-compile-compiler-macro)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3498 (put (car y) 'cl-compiler-macro
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3499 (list 'lambda '(w x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3500 (if (symbolp (cadr y))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3501 (list 'list (list 'quote (cadr y))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3502 (list 'list (list 'quote (caddr y)) 'x))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3503 (cons 'list (cdr y))))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3504 '((first 'car x) (second 'cadr x) (third 'caddr x) (fourth 'cadddr x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3505 (fifth 'nth 4 x) (sixth 'nth 5 x) (seventh 'nth 6 x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3506 (eighth 'nth 7 x) (ninth 'nth 8 x) (tenth 'nth 9 x)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3507 (rest 'cdr x) (endp 'null x) (plusp '> x 0) (minusp '< x 0)
446
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
3508 (oddp 'eq (list 'logand x 1) 1)
1ccc32a20af4 Import from CVS: tag r21-2-38
cvs
parents: 444
diff changeset
3509 (evenp 'eq (list 'logand x 1) 0)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3510 (caar car car) (cadr car cdr) (cdar cdr car) (cddr cdr cdr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3511 (caaar car caar) (caadr car cadr) (cadar car cdar)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3512 (caddr car cddr) (cdaar cdr caar) (cdadr cdr cadr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3513 (cddar cdr cdar) (cdddr cdr cddr) (caaaar car caaar)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3514 (caaadr car caadr) (caadar car cadar) (caaddr car caddr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3515 (cadaar car cdaar) (cadadr car cdadr) (caddar car cddar)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3516 (cadddr car cdddr) (cdaaar cdr caaar) (cdaadr cdr caadr)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3517 (cdadar cdr cadar) (cdaddr cdr caddr) (cddaar cdr cdaar)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3518 (cddadr cdr cdadr) (cdddar cdr cddar) (cddddr cdr cdddr)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3519
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3520 ;;; Things that are inline.
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3521 (proclaim '(inline acons map concatenate notany notevery
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3522 ;; XEmacs omission: gethash is builtin
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3523 cl-set-elt revappend nreconc))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3524
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3525 ;;; Things that are side-effect-free. Moved to byte-optimize.el
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3526 ;(mapcar (function (lambda (x) (put x 'side-effect-free t)))
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3527 ; '(oddp evenp signum last butlast ldiff pairlis gcd lcm
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3528 ; isqrt floor* ceiling* truncate* round* mod* rem* subseq
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3529 ; list-length get* getf))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3530
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3531 ;;; Things that are side-effect-and-error-free. Moved to byte-optimize.el
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3532 ;(mapcar (function (lambda (x) (put x 'side-effect-free 'error-free)))
4885
6772ce4d982b Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
Aidan Kehoe <kehoea@parhasard.net>
parents: 4820
diff changeset
3533 ; '(eql list* subst acons equalp random-state-p
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3534 ; copy-tree sublis))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3535
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3536
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3537 (run-hooks 'cl-macs-load-hook)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3538
2153
393039450288 [xemacs-hg @ 2004-06-26 21:25:23 by james]
james
parents: 1580
diff changeset
3539 ;;; arch-tag: afd947a6-b553-4df1-bba5-000be6388f46
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3540 ;;; cl-macs.el ends here