Mercurial > emacs
annotate lisp/emacs-lisp/macroexp.el @ 68192:2cfa649fa39d
* mh-customize.el (mh-index): Rename group to mh-search and sort group
definition and options accordingly.
(mh-index-program): Rename to mh-search-program.
(mh-kill-folder-suppress-prompt-hooks): Rename mh-index-p to
mh-search-p.
(mh-search-mode-hook): Change group from mh-index to mh-search.
(mh-index-folder): Rename to mh-search-folder. Change group from
mh-index to mh-search.
* mh-e.el (mh-folder-font-lock-keywords): Rename mh-index-folder to
mh-search-folder.
* mh-search.el (mh-indexer) Rename to mh-searcher. The commands pick
and grep are searchers too but aren't indexed.
(mh-index-execute-search-function): Rename to mh-search-function.
(mh-index-next-result-function): Rename to
mh-search-next-result-function.
(mh-index-regexp-builder): Rename to mh-search-regexp-builder.
(mh-search): Since redo-search-flag defaults to nil and is of lesser
importance, make it an optional argument and place it after the folder
and search-regexp arguments. Sync docstring with manual.
(mh-search-mode-map): Autoload so that keys are shown in help even
before mh-search is loaded.
(mh-search-mode): Sync docstring with manual.
(mh-index-do-search): Rename argument indexer to searcher. Sync
docstring with manual.
(mh-pick-do-search): Sync docstring with manual.
(mh-index-p): Rename to mh-search-p.
(mh-indexer-choices): Rename to mh-search-choices.
(mh-index-choose): Rename to mh-search-choose. Rename argument indexer
to searcher.
(mh-swish++-execute-search, mh-swish-execute-search)
(mh-mairix-execute-search, mh-namazu-execute-search): Drop "and read
the results" from docstring since these functions don't.
(mh-pick-execute-search, mh-grep-execute-search): Sync docstring with
manual.
(mh-index-generate-pretty-name): Prune -search from string so that
folder names for pick searches are the same as those of other
searches.
author | Bill Wohler <wohler@newt.com> |
---|---|
date | Sat, 14 Jan 2006 21:17:37 +0000 |
parents | 5b1a238fcbb4 |
children | 067115a6e738 |
rev | line source |
---|---|
53905
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
1 ;;; macroexp.el --- Additional macro-expansion support |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
2 ;; |
64751
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
3 ;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
53905
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
4 ;; |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
5 ;; Author: Miles Bader <miles@gnu.org> |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
6 ;; Keywords: lisp, compiler, macros |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
7 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
8 ;; This file is part of GNU Emacs. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
9 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
10 ;; GNU Emacs is free software; you can redistribute it and/or modify |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
11 ;; it under the terms of the GNU General Public License as published by |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
13 ;; any later version. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
14 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
15 ;; GNU Emacs is distributed in the hope that it will be useful, |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
18 ;; GNU General Public License for more details. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
19 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
20 ;; You should have received a copy of the GNU General Public License |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64085 | 22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 ;; Boston, MA 02110-1301, USA. | |
53905
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
24 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
25 ;;; Commentary: |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
26 ;; |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
27 ;; This file contains macro-expansions functions that are not defined in |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
28 ;; the Lisp core, namely `macroexpand-all', which expands all macros in |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
29 ;; a form, not just a top-level one. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
30 ;; |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
31 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
32 ;;; Code: |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
33 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
34 ;; Bound by the top-level `macroexpand-all', and modified to include any |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
35 ;; macros defined by `defmacro'. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
36 (defvar macroexpand-all-environment nil) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
37 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
38 (defun maybe-cons (car cdr original-cons) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
39 "Return (CAR . CDR), using ORIGINAL-CONS if possible." |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
40 (if (and (eq car (car original-cons)) (eq cdr (cdr original-cons))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
41 original-cons |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
42 (cons car cdr))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
43 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
44 ;; We use this special macro to iteratively process forms and share list |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
45 ;; structure of the result with the input. Doing so recursively using |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
46 ;; `maybe-cons' results in excessively deep recursion for very long |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
47 ;; input forms. |
63940
5412b4421984
(macroexp-accumulate): Rename arg to var+list.
Richard M. Stallman <rms@gnu.org>
parents:
53905
diff
changeset
|
48 (defmacro macroexp-accumulate (var+list &rest body) |
53905
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
49 "Return a list of the results of evaluating BODY for each element of LIST. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
50 Evaluate BODY with VAR bound to each `car' from LIST, in turn. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
51 Return a list of the values of the final form in BODY. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
52 The list structure of the result will share as much with LIST as |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
53 possible (for instance, when BODY just returns VAR unchanged, the |
63940
5412b4421984
(macroexp-accumulate): Rename arg to var+list.
Richard M. Stallman <rms@gnu.org>
parents:
53905
diff
changeset
|
54 result will be eq to LIST). |
5412b4421984
(macroexp-accumulate): Rename arg to var+list.
Richard M. Stallman <rms@gnu.org>
parents:
53905
diff
changeset
|
55 |
5412b4421984
(macroexp-accumulate): Rename arg to var+list.
Richard M. Stallman <rms@gnu.org>
parents:
53905
diff
changeset
|
56 \(fn (VAR LIST) BODY...)" |
5412b4421984
(macroexp-accumulate): Rename arg to var+list.
Richard M. Stallman <rms@gnu.org>
parents:
53905
diff
changeset
|
57 (let ((var (car var+list)) |
5412b4421984
(macroexp-accumulate): Rename arg to var+list.
Richard M. Stallman <rms@gnu.org>
parents:
53905
diff
changeset
|
58 (list (cadr var+list)) |
53905
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
59 (shared (make-symbol "shared")) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
60 (unshared (make-symbol "unshared")) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
61 (tail (make-symbol "tail")) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
62 (new-el (make-symbol "new-el"))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
63 `(let* ((,shared ,list) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
64 (,unshared nil) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
65 (,tail ,shared) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
66 ,var ,new-el) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
67 (while ,tail |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
68 (setq ,var (car ,tail) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
69 ,new-el (progn ,@body)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
70 (unless (eq ,var ,new-el) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
71 (while (not (eq ,shared ,tail)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
72 (push (pop ,shared) ,unshared)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
73 (setq ,shared (cdr ,shared)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
74 (push ,new-el ,unshared)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
75 (setq ,tail (cdr ,tail))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
76 (nconc (nreverse ,unshared) ,shared)))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
77 (put 'macroexp-accumulate 'lisp-indent-function 1) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
78 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
79 (defun macroexpand-all-forms (forms &optional skip) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
80 "Return FORMS with macros expanded. FORMS is a list of forms. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
81 If SKIP is non-nil, then don't expand that many elements at the start of |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
82 FORMS." |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
83 (macroexp-accumulate (form forms) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
84 (if (or (null skip) (zerop skip)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
85 (macroexpand-all-1 form) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
86 (setq skip (1- skip)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
87 form))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
88 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
89 (defun macroexpand-all-clauses (clauses &optional skip) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
90 "Return CLAUSES with macros expanded. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
91 CLAUSES is a list of lists of forms; any clause that's not a list is ignored. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
92 If SKIP is non-nil, then don't expand that many elements at the start of |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
93 each clause." |
64751
5b1a238fcbb4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
94 (macroexp-accumulate (clause clauses) |
53905
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
95 (if (listp clause) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
96 (macroexpand-all-forms clause skip) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
97 clause))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
98 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
99 (defun macroexpand-all-1 (form) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
100 "Expand all macros in FORM. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
101 This is an internal version of `macroexpand-all'. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
102 Assumes the caller has bound `macroexpand-all-environment'." |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
103 (if (and (listp form) (eq (car form) 'backquote-list*)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
104 ;; Special-case `backquote-list*', as it is normally a macro that |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
105 ;; generates exceedingly deep expansions from relatively shallow input |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
106 ;; forms. We just process it `in reverse' -- first we expand all the |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
107 ;; arguments, _then_ we expand the top-level definition. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
108 (macroexpand (macroexpand-all-forms form 1) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
109 macroexpand-all-environment) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
110 ;; Normal form; get its expansion, and then expand arguments. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
111 (setq form (macroexpand form macroexpand-all-environment)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
112 (if (consp form) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
113 (let ((fun (car form))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
114 (cond |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
115 ((eq fun 'cond) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
116 (maybe-cons fun (macroexpand-all-clauses (cdr form)) form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
117 ((eq fun 'condition-case) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
118 (maybe-cons |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
119 fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
120 (maybe-cons (cadr form) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
121 (maybe-cons (macroexpand-all-1 (nth 2 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
122 (macroexpand-all-clauses (nthcdr 3 form) 1) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
123 (cddr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
124 (cdr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
125 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
126 ((eq fun 'defmacro) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
127 (push (cons (cadr form) (cons 'lambda (cddr form))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
128 macroexpand-all-environment) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
129 (macroexpand-all-forms form 3)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
130 ((eq fun 'defun) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
131 (macroexpand-all-forms form 3)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
132 ((memq fun '(defvar defconst)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
133 (macroexpand-all-forms form 2)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
134 ((eq fun 'function) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
135 (if (and (consp (cadr form)) (eq (car (cadr form)) 'lambda)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
136 (maybe-cons fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
137 (maybe-cons (macroexpand-all-forms (cadr form) 2) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
138 nil |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
139 (cadr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
140 form) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
141 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
142 ((memq fun '(let let*)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
143 (maybe-cons fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
144 (maybe-cons (macroexpand-all-clauses (cadr form) 1) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
145 (macroexpand-all-forms (cddr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
146 (cdr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
147 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
148 ((eq fun 'quote) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
149 form) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
150 ((and (consp fun) (eq (car fun) 'lambda)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
151 ;; embedded lambda |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
152 (maybe-cons (macroexpand-all-forms fun 2) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
153 (macroexpand-all-forms (cdr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
154 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
155 ;; The following few cases are for normal function calls that |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
156 ;; are known to funcall one of their arguments. The byte |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
157 ;; compiler has traditionally handled these functions specially |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
158 ;; by treating a lambda expression quoted by `quote' as if it |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
159 ;; were quoted by `function'. We make the same transformation |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
160 ;; here, so that any code that cares about the difference will |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
161 ;; see the same transformation. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
162 ;; First arg is a function: |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
163 ((and (memq fun '(apply mapcar mapatoms mapconcat mapc)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
164 (consp (cadr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
165 (eq (car (cadr form)) 'quote)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
166 ;; We don't use `maybe-cons' since there's clearly a change. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
167 (cons fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
168 (cons (macroexpand-all-1 (cons 'function (cdr (cadr form)))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
169 (macroexpand-all-forms (cddr form))))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
170 ;; Second arg is a function: |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
171 ((and (eq fun 'sort) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
172 (consp (nth 2 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
173 (eq (car (nth 2 form)) 'quote)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
174 ;; We don't use `maybe-cons' since there's clearly a change. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
175 (cons fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
176 (cons (macroexpand-all-1 (cadr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
177 (cons (macroexpand-all-1 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
178 (cons 'function (cdr (nth 2 form)))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
179 (macroexpand-all-forms (nthcdr 3 form)))))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
180 (t |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
181 ;; For everything else, we just expand each argument (for |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
182 ;; setq/setq-default this works alright because the variable names |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
183 ;; are symbols). |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
184 (macroexpand-all-forms form 1)))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
185 form))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
186 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
187 ;;;###autoload |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
188 (defun macroexpand-all (form &optional environment) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
189 "Return result of expanding macros at all levels in FORM. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
190 If no macros are expanded, FORM is returned unchanged. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
191 The second optional arg ENVIRONMENT specifies an environment of macro |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
192 definitions to shadow the loaded ones for use in file byte-compilation." |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
193 (let ((macroexpand-all-environment environment)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
194 (macroexpand-all-1 form))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
195 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
196 (provide 'macroexp) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
197 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
198 ;;; arch-tag: af9b8c24-c196-43bc-91e1-a3570790fa5a |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
199 ;;; macroexp.el ends here |