Mercurial > emacs
annotate lisp/emacs-lisp/macroexp.el @ 58229:7f5b01c17652
(math-integrate-by-parts): Removed unused variable var-thing.
(math-integ-depth, math-integ-level, math-integral-limit)
(math-enable-subst, math-any-substs, math-integ-msg)
(math-prev-parts-v, math-good-parts, math-max-integral-limit)
(math-int-threshold, math-int-factors, math-double-roots)
(math-solve-simplifying, var-IntegLimit, math-solve-sign)
(var-GenCount): Declared these variables.
(calcFunc-integ): Don't check if var-IntegLimit is bound.
(math-integral-cache, math-integral-cache-state): Move declarations
to earlier in the file.
(math-deriv-var, math-deriv-total, math-deriv-symb): New variables.
(math-derivative, calcFunc-deriv, calcFunc-tderiv): Replace
variables deriv-var, deriv-total and deriv-symb by declared variables
math-deriv-var, math-deriv-total and math-deriv-symb.
(math-cur-record): New variable.
(math-integral, math-replace-integral-parts, math-integrate-by-parts)
(calc-dump-integral-cache, math-try-integral): Replace variable
cur-record by declared variable math-cur-record.
(math-has-rules): New variable.
(math-try-integral, math-do-integral): Use declared variable
math-has-rules instead of has-rules.
(math-t1, math-t2, math-t3): New variables.
(math-do-integral, math-do-integral-methods, math-try-solve-for)
(math-try-solve-prod, math-solve-poly-funny-powers)
(math-solve-crunch-poly, math-decompose-poly)
(math-solve-find-root-term, math-find-root-in-prod): Replace
variables t1, t2, t3 by declared variables math-t1, math-t2,
math-t3.
(math-so-far, math-integ-expr): New variables.
(math-do-integral-methods, math-integ-try-linear-substitutions)
(math-integ-try-substitutions): Replace variables so-far and expr by
declared variables math-so-far and math-integ-expr.
(math-expr-parts): New variable.
(math-expr-rational-in, math-expr-rational-in-rec): Replace variable
parts by declared variable math-expr-parts.
(calc-low, calc-high): New variables.
(calcFunc-table, math-scan-for-limits): Replaced variable low and
high with the declared variable calc-low and calc-high.
(math-solve-var, math-solve-full): New variables.
(math-try-solve-for, math-try-solve-prod, math-solve-prod)
(math-decompose-poly, math-solve-quartic, math-poly-all-roots)
(math-solve-find-root-in-prod, math-solve-for, math-solve-system)
(math-solve-system-rec, math-solve-get-sign, math-solve-get-int):
Replace variables solve-var and solve-full with declared variables
math-solve-var and math-solve-full.
(math-solve-vars): New variable.
(math-solve-system, math-solve-system-rec): Replace variable
solve-vars with declared variable math-solve-vars.
(math-try-solve-sign): New variable.
(math-try-solve-for, math-try-solve-prod): Replace variable
sign by declared variable math-try-solve-sign.
(math-solve-b): New variable.
(math-solve-poly-funny-powers, math-decompose-poly): Replace variable
b by declared variable math-solve-b.
(math-solve-system-vv, math-solve-res): New variables
(math-solve-system-rec, math-solve-system-subst): Replaced variables
vv and res with declared variables math-solve-system-vv and
math-solve-system-res.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Mon, 15 Nov 2004 06:16:21 +0000 |
parents | 328854727be4 |
children | 5412b4421984 |
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 ;; |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
3 ;; Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. |
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 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
23 ;; Boston, MA 02111-1307, USA. |
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. |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
48 (defmacro macroexp-accumulate (#1=#:\(var\ list\) &rest body) |
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 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
54 result will be eq to LIST)." |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
55 (let ((var (car #1#)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
56 (list (cadr #1#)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
57 (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
|
58 (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
|
59 (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
|
60 (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
|
61 `(let* ((,shared ,list) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
62 (,unshared nil) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
63 (,tail ,shared) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
64 ,var ,new-el) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
65 (while ,tail |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
66 (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
|
67 ,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
|
68 (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
|
69 (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
|
70 (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
|
71 (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
|
72 (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
|
73 (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
|
74 (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
|
75 (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
|
76 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
77 (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
|
78 "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
|
79 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
|
80 FORMS." |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
81 (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
|
82 (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
|
83 (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
|
84 (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
|
85 form))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
86 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
87 (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
|
88 "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
|
89 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
|
90 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
|
91 each clause." |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
92 (macroexp-accumulate (clause clauses) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
93 (if (listp clause) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
94 (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
|
95 clause))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
96 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
97 (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
|
98 "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
|
99 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
|
100 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
|
101 (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
|
102 ;; 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
|
103 ;; 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
|
104 ;; 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
|
105 ;; 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
|
106 (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
|
107 macroexpand-all-environment) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
108 ;; 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
|
109 (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
|
110 (if (consp form) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
111 (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
|
112 (cond |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
113 ((eq fun 'cond) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
114 (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
|
115 ((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
|
116 (maybe-cons |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
117 fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
118 (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
|
119 (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
|
120 (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
|
121 (cddr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
122 (cdr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
123 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
124 ((eq fun 'defmacro) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
125 (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
|
126 macroexpand-all-environment) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
127 (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
|
128 ((eq fun 'defun) |
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 ((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
|
131 (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
|
132 ((eq fun 'function) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
133 (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
|
134 (maybe-cons fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
135 (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
|
136 nil |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
137 (cadr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
138 form) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
139 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
140 ((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
|
141 (maybe-cons fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
142 (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
|
143 (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
|
144 (cdr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
145 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
146 ((eq fun 'quote) |
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 ((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
|
149 ;; embedded lambda |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
150 (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
|
151 (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
|
152 form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
153 ;; 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
|
154 ;; 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
|
155 ;; 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
|
156 ;; 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
|
157 ;; 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
|
158 ;; 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
|
159 ;; 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
|
160 ;; 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
|
161 ((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
|
162 (consp (cadr form)) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
163 (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
|
164 ;; 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
|
165 (cons fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
166 (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
|
167 (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
|
168 ;; 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
|
169 ((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
|
170 (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
|
171 (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
|
172 ;; 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
|
173 (cons fun |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
174 (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
|
175 (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
|
176 (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
|
177 (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
|
178 (t |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
179 ;; 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
|
180 ;; 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
|
181 ;; are symbols). |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
182 (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
|
183 form))) |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
184 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
185 ;;;###autoload |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
186 (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
|
187 "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
|
188 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
|
189 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
|
190 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
|
191 (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
|
192 (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
|
193 |
328854727be4
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
Miles Bader <miles@gnu.org>
parents:
diff
changeset
|
194 (provide 'macroexp) |
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 ;;; 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
|
197 ;;; macroexp.el ends here |