2012-06-08 09:18:26 -04:00
|
|
|
;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t; coding: utf-8 -*-
|
2004-02-10 01:52:31 +00:00
|
|
|
;;
|
2015-01-01 14:26:41 -08:00
|
|
|
;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
2004-02-10 01:52:31 +00:00
|
|
|
;;
|
|
|
|
;; Author: Miles Bader <miles@gnu.org>
|
|
|
|
;; Keywords: lisp, compiler, macros
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:21:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2004-02-10 01:52:31 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:21:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2004-02-10 01:52:31 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 03:21:21 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2004-02-10 01:52:31 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
;;
|
|
|
|
;; This file contains macro-expansions functions that are not defined in
|
|
|
|
;; the Lisp core, namely `macroexpand-all', which expands all macros in
|
|
|
|
;; a form, not just a top-level one.
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
;; Bound by the top-level `macroexpand-all', and modified to include any
|
|
|
|
;; macros defined by `defmacro'.
|
|
|
|
(defvar macroexpand-all-environment nil)
|
|
|
|
|
2012-06-06 14:08:00 -04:00
|
|
|
(defun macroexp--cons (car cdr original-cons)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Return (CAR . CDR), using ORIGINAL-CONS if possible."
|
|
|
|
(if (and (eq car (car original-cons)) (eq cdr (cdr original-cons)))
|
|
|
|
original-cons
|
|
|
|
(cons car cdr)))
|
|
|
|
|
|
|
|
;; We use this special macro to iteratively process forms and share list
|
|
|
|
;; structure of the result with the input. Doing so recursively using
|
2012-06-06 14:08:00 -04:00
|
|
|
;; `macroexp--cons' results in excessively deep recursion for very long
|
2004-02-10 01:52:31 +00:00
|
|
|
;; input forms.
|
2012-06-06 14:08:00 -04:00
|
|
|
(defmacro macroexp--accumulate (var+list &rest body)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Return a list of the results of evaluating BODY for each element of LIST.
|
|
|
|
Evaluate BODY with VAR bound to each `car' from LIST, in turn.
|
|
|
|
Return a list of the values of the final form in BODY.
|
|
|
|
The list structure of the result will share as much with LIST as
|
|
|
|
possible (for instance, when BODY just returns VAR unchanged, the
|
2005-07-03 16:17:50 +00:00
|
|
|
result will be eq to LIST).
|
|
|
|
|
|
|
|
\(fn (VAR LIST) BODY...)"
|
2010-08-28 20:52:36 +02:00
|
|
|
(declare (indent 1))
|
2005-07-03 16:17:50 +00:00
|
|
|
(let ((var (car var+list))
|
|
|
|
(list (cadr var+list))
|
2004-02-10 01:52:31 +00:00
|
|
|
(shared (make-symbol "shared"))
|
|
|
|
(unshared (make-symbol "unshared"))
|
|
|
|
(tail (make-symbol "tail"))
|
|
|
|
(new-el (make-symbol "new-el")))
|
|
|
|
`(let* ((,shared ,list)
|
|
|
|
(,unshared nil)
|
|
|
|
(,tail ,shared)
|
|
|
|
,var ,new-el)
|
2012-05-29 23:59:42 -04:00
|
|
|
(while (consp ,tail)
|
2004-02-10 01:52:31 +00:00
|
|
|
(setq ,var (car ,tail)
|
|
|
|
,new-el (progn ,@body))
|
|
|
|
(unless (eq ,var ,new-el)
|
|
|
|
(while (not (eq ,shared ,tail))
|
|
|
|
(push (pop ,shared) ,unshared))
|
|
|
|
(setq ,shared (cdr ,shared))
|
|
|
|
(push ,new-el ,unshared))
|
|
|
|
(setq ,tail (cdr ,tail)))
|
|
|
|
(nconc (nreverse ,unshared) ,shared))))
|
|
|
|
|
2012-06-06 14:08:00 -04:00
|
|
|
(defun macroexp--all-forms (forms &optional skip)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Return FORMS with macros expanded. FORMS is a list of forms.
|
|
|
|
If SKIP is non-nil, then don't expand that many elements at the start of
|
|
|
|
FORMS."
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--accumulate (form forms)
|
2004-02-10 01:52:31 +00:00
|
|
|
(if (or (null skip) (zerop skip))
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--expand-all form)
|
2004-02-10 01:52:31 +00:00
|
|
|
(setq skip (1- skip))
|
|
|
|
form)))
|
|
|
|
|
2012-06-06 14:08:00 -04:00
|
|
|
(defun macroexp--all-clauses (clauses &optional skip)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Return CLAUSES with macros expanded.
|
|
|
|
CLAUSES is a list of lists of forms; any clause that's not a list is ignored.
|
|
|
|
If SKIP is non-nil, then don't expand that many elements at the start of
|
|
|
|
each clause."
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--accumulate (clause clauses)
|
2004-02-10 01:52:31 +00:00
|
|
|
(if (listp clause)
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--all-forms clause skip)
|
2004-02-10 01:52:31 +00:00
|
|
|
clause)))
|
|
|
|
|
2012-06-14 23:18:14 -04:00
|
|
|
(defun macroexp--compiler-macro (handler form)
|
|
|
|
(condition-case err
|
|
|
|
(apply handler form (cdr form))
|
2014-04-21 02:34:21 -07:00
|
|
|
(error
|
|
|
|
(message "Compiler-macro error for %S: %S" (car form) err)
|
2012-06-14 23:20:42 -04:00
|
|
|
form)))
|
2012-06-14 23:18:14 -04:00
|
|
|
|
2012-09-19 15:59:52 -04:00
|
|
|
(defun macroexp--funcall-if-compiled (_form)
|
2012-09-04 13:40:25 -04:00
|
|
|
"Pseudo function used internally by macroexp to delay warnings.
|
|
|
|
The purpose is to delay warnings to bytecomp.el, so they can use things
|
|
|
|
like `byte-compile-log-warning' to get better file-and-line-number data
|
|
|
|
and also to avoid outputting the warning during normal execution."
|
|
|
|
nil)
|
2012-09-19 15:59:52 -04:00
|
|
|
(put 'macroexp--funcall-if-compiled 'byte-compile
|
2012-09-04 13:40:25 -04:00
|
|
|
(lambda (form)
|
2012-09-19 15:59:52 -04:00
|
|
|
(funcall (eval (cadr form)))
|
2012-09-04 13:40:25 -04:00
|
|
|
(byte-compile-constant nil)))
|
|
|
|
|
2013-06-04 22:35:40 -04:00
|
|
|
(defun macroexp--compiling-p ()
|
|
|
|
"Return non-nil if we're macroexpanding for the compiler."
|
|
|
|
;; FIXME: ¡¡Major Ugly Hack!! To determine whether the output of this
|
|
|
|
;; macro-expansion will be processed by the byte-compiler, we check
|
|
|
|
;; circumstantial evidence.
|
|
|
|
(member '(declare-function . byte-compile-macroexpand-declare-function)
|
|
|
|
macroexpand-all-environment))
|
|
|
|
|
|
|
|
|
2012-09-20 09:46:36 -04:00
|
|
|
(defun macroexp--warn-and-return (msg form)
|
|
|
|
(let ((when-compiled (lambda () (byte-compile-log-warning msg t))))
|
|
|
|
(cond
|
|
|
|
((null msg) form)
|
2013-06-04 22:35:40 -04:00
|
|
|
((macroexp--compiling-p)
|
2012-09-19 15:59:52 -04:00
|
|
|
`(progn
|
|
|
|
(macroexp--funcall-if-compiled ',when-compiled)
|
2012-09-20 09:46:36 -04:00
|
|
|
,form))
|
|
|
|
(t
|
2012-12-14 16:27:39 -05:00
|
|
|
(message "%s%s" (if (stringp load-file-name)
|
|
|
|
(concat (file-relative-name load-file-name) ": ")
|
|
|
|
"")
|
|
|
|
msg)
|
2012-09-20 09:46:36 -04:00
|
|
|
form))))
|
|
|
|
|
|
|
|
(defun macroexp--obsolete-warning (fun obsolescence-data type)
|
|
|
|
(let ((instead (car obsolescence-data))
|
|
|
|
(asof (nth 2 obsolescence-data)))
|
|
|
|
(format "`%s' is an obsolete %s%s%s" fun type
|
|
|
|
(if asof (concat " (as of " asof ")") "")
|
|
|
|
(cond ((stringp instead) (concat "; " instead))
|
|
|
|
(instead (format "; use `%s' instead." instead))
|
|
|
|
(t ".")))))
|
2012-09-19 09:09:43 -07:00
|
|
|
|
2014-10-31 17:35:35 -04:00
|
|
|
(defun macroexpand-1 (form &optional environment)
|
|
|
|
"Perform (at most) one step of macroexpansion."
|
|
|
|
(cond
|
|
|
|
((consp form)
|
|
|
|
(let* ((head (car form))
|
|
|
|
(env-expander (assq head environment)))
|
|
|
|
(if env-expander
|
|
|
|
(if (cdr env-expander)
|
|
|
|
(apply (cdr env-expander) (cdr form))
|
|
|
|
form)
|
|
|
|
(if (not (and (symbolp head) (fboundp head)))
|
|
|
|
form
|
|
|
|
(let ((def (autoload-do-load (symbol-function head) head 'macro)))
|
|
|
|
(cond
|
|
|
|
;; Follow alias, but only for macros, otherwise we may end up
|
|
|
|
;; skipping an important compiler-macro (e.g. cl--block-wrapper).
|
|
|
|
((and (symbolp def) (macrop def)) (cons def (cdr form)))
|
|
|
|
((not (consp def)) form)
|
|
|
|
(t
|
|
|
|
(if (eq 'macro (car def))
|
|
|
|
(apply (cdr def) (cdr form))
|
|
|
|
form))))))))
|
|
|
|
(t form)))
|
|
|
|
|
2012-06-06 14:08:00 -04:00
|
|
|
(defun macroexp--expand-all (form)
|
2004-02-10 01:52:31 +00:00
|
|
|
"Expand all macros in FORM.
|
|
|
|
This is an internal version of `macroexpand-all'.
|
|
|
|
Assumes the caller has bound `macroexpand-all-environment'."
|
2014-10-31 17:35:35 -04:00
|
|
|
(if (eq (car-safe form) 'backquote-list*)
|
2004-02-10 01:52:31 +00:00
|
|
|
;; Special-case `backquote-list*', as it is normally a macro that
|
|
|
|
;; generates exceedingly deep expansions from relatively shallow input
|
|
|
|
;; forms. We just process it `in reverse' -- first we expand all the
|
|
|
|
;; arguments, _then_ we expand the top-level definition.
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexpand (macroexp--all-forms form 1)
|
2004-02-10 01:52:31 +00:00
|
|
|
macroexpand-all-environment)
|
|
|
|
;; Normal form; get its expansion, and then expand arguments.
|
2012-09-04 13:40:25 -04:00
|
|
|
(let ((new-form
|
|
|
|
(macroexpand form macroexpand-all-environment)))
|
|
|
|
(setq form
|
|
|
|
(if (and (not (eq form new-form)) ;It was a macro call.
|
|
|
|
(car-safe form)
|
|
|
|
(symbolp (car form))
|
2012-10-26 11:59:40 -04:00
|
|
|
(get (car form) 'byte-obsolete-info)
|
|
|
|
(or (not (fboundp 'byte-compile-warning-enabled-p))
|
|
|
|
(byte-compile-warning-enabled-p 'obsolete)))
|
2012-09-20 09:46:36 -04:00
|
|
|
(let* ((fun (car form))
|
|
|
|
(obsolete (get fun 'byte-obsolete-info)))
|
|
|
|
(macroexp--warn-and-return
|
2012-10-26 11:59:40 -04:00
|
|
|
(macroexp--obsolete-warning
|
|
|
|
fun obsolete
|
|
|
|
(if (symbolp (symbol-function fun))
|
|
|
|
"alias" "macro"))
|
2012-09-20 09:46:36 -04:00
|
|
|
new-form))
|
2012-09-04 13:40:25 -04:00
|
|
|
new-form)))
|
2010-08-28 20:52:36 +02:00
|
|
|
(pcase form
|
|
|
|
(`(cond . ,clauses)
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--cons 'cond (macroexp--all-clauses clauses) form))
|
2010-08-28 20:52:36 +02:00
|
|
|
(`(condition-case . ,(or `(,err ,body . ,handlers) dontcare))
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--cons
|
2010-08-28 20:52:36 +02:00
|
|
|
'condition-case
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--cons err
|
|
|
|
(macroexp--cons (macroexp--expand-all body)
|
|
|
|
(macroexp--all-clauses handlers 1)
|
2010-08-28 20:52:36 +02:00
|
|
|
(cddr form))
|
|
|
|
(cdr form))
|
|
|
|
form))
|
2012-06-06 14:08:00 -04:00
|
|
|
(`(,(or `defvar `defconst) . ,_) (macroexp--all-forms form 2))
|
2010-08-28 20:52:36 +02:00
|
|
|
(`(function ,(and f `(lambda . ,_)))
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--cons 'function
|
|
|
|
(macroexp--cons (macroexp--all-forms f 2)
|
2010-08-28 20:52:36 +02:00
|
|
|
nil
|
|
|
|
(cdr form))
|
|
|
|
form))
|
|
|
|
(`(,(or `function `quote) . ,_) form)
|
|
|
|
(`(,(and fun (or `let `let*)) . ,(or `(,bindings . ,body) dontcare))
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--cons fun
|
|
|
|
(macroexp--cons (macroexp--all-clauses bindings 1)
|
|
|
|
(macroexp--all-forms body)
|
2010-08-28 20:52:36 +02:00
|
|
|
(cdr form))
|
|
|
|
form))
|
|
|
|
(`(,(and fun `(lambda . ,_)) . ,args)
|
|
|
|
;; Embedded lambda in function position.
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--cons (macroexp--all-forms fun 2)
|
|
|
|
(macroexp--all-forms args)
|
2010-08-28 20:52:36 +02:00
|
|
|
form))
|
|
|
|
;; The following few cases are for normal function calls that
|
|
|
|
;; are known to funcall one of their arguments. The byte
|
|
|
|
;; compiler has traditionally handled these functions specially
|
|
|
|
;; by treating a lambda expression quoted by `quote' as if it
|
|
|
|
;; were quoted by `function'. We make the same transformation
|
|
|
|
;; here, so that any code that cares about the difference will
|
|
|
|
;; see the same transformation.
|
|
|
|
;; First arg is a function:
|
2011-05-22 15:22:30 -03:00
|
|
|
(`(,(and fun (or `funcall `apply `mapcar `mapatoms `mapconcat `mapc))
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-24 22:27:45 -05:00
|
|
|
',(and f `(lambda . ,_)) . ,args)
|
2012-09-19 15:59:52 -04:00
|
|
|
(macroexp--warn-and-return
|
2011-05-22 15:22:30 -03:00
|
|
|
(format "%s quoted with ' rather than with #'"
|
|
|
|
(list 'lambda (nth 1 f) '...))
|
2012-09-19 15:59:52 -04:00
|
|
|
(macroexp--expand-all `(,fun ,f . ,args))))
|
2010-08-28 20:52:36 +02:00
|
|
|
;; Second arg is a function:
|
Get rid of funvec.
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Handle new form of
`byte-constant'.
(byte-compile-close-variables, displaying-byte-compile-warnings):
Add edebug spec.
(byte-compile-toplevel-file-form): New fun, split out of
byte-compile-file-form.
(byte-compile-from-buffer): Use it to avoid applying cconv
multiple times.
(byte-compile): Only strip `function' if it's present.
(byte-compile-lambda): Add `reserved-csts' argument.
Use new lexenv arg of byte-compile-top-level.
(byte-compile-reserved-constants): New var.
(byte-compile-constants-vector): Obey it.
(byte-compile-constants-vector): Handle new `byte-constant' form.
(byte-compile-top-level): Add args `lexenv' and `reserved-csts'.
(byte-compile-form): Don't check callargs here.
(byte-compile-normal-call): Do it here instead.
(byte-compile-push-unknown-constant)
(byte-compile-resolve-unknown-constant): Remove, unused.
(byte-compile-make-closure): Use `make-byte-code' rather than `curry',
putting the environment into the "constant" pool.
(byte-compile-get-closed-var): Use special byte-constant.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Handle new
intermediate special form `internal-make-vector'.
(byte-optimize-lapcode): Handle new form of `byte-constant'.
* lisp/help-fns.el (describe-function-1): Don't handle funvecs.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Only convert quote to
function if the content is a lambda expression, not if it's a closure.
* emacs-lisp/eieio-come.el: Remove.
* lisp/emacs-lisp/eieio.el: Don't require eieio-comp.
(defmethod): Do a bit more work to find the body and wrap it into
a function before passing it to eieio-defmethod.
(eieio-defmethod): New arg `code' for it.
* lisp/emacs-lisp/debug.el (debugger-setup-buffer): Don't hide things in
debugger backtrace.
* lisp/emacs-lisp/cl-extra.el (cl-macroexpand-all): Use backquotes, and be
more careful when quoting a function value.
* lisp/emacs-lisp/cconv.el (cconv-freevars): Accept defvar/defconst.
(cconv-closure-convert-rec): Catch stray `internal-make-closure'.
* lisp/Makefile.in (COMPILE_FIRST): Compile pcase and cconv early.
* src/eval.c (Qcurry): Remove.
(funcall_funvec): Remove.
(funcall_lambda): Move new byte-code handling to reduce impact.
Treat all args as lexical in the case of lexbind.
(Fcurry): Remove.
* src/data.c (Qfunction_vector): Remove.
(Ffunvecp): Remove.
* src/lread.c (read1): Revert to calling make_byte_code here.
(read_vector): Don't call make_byte_code any more.
* src/lisp.h (enum pvec_type): Rename back to PVEC_COMPILED.
(XSETCOMPILED): Rename back from XSETFUNVEC.
(FUNVEC_SIZE): Remove.
(FUNVEC_COMPILED_TAG_P, FUNVEC_COMPILED_P): Remove.
(COMPILEDP): Rename back from FUNVECP.
* src/fns.c (Felt): Remove unexplained FUNVEC check.
* src/doc.c (Fdocumentation): Don't handle funvec.
* src/alloc.c (make_funvec, Ffunvec): Remove.
* doc/lispref/vol2.texi (Top):
* doc/lispref/vol1.texi (Top):
* doc/lispref/objects.texi (Programming Types, Funvec Type, Type Predicates):
* doc/lispref/functions.texi (Functions, What Is a Function, FunctionCurrying):
* doc/lispref/elisp.texi (Top): Remove mentions of funvec and curry.
2011-02-24 22:27:45 -05:00
|
|
|
(`(,(and fun (or `sort)) ,arg1 ',(and f `(lambda . ,_)) . ,args)
|
2012-09-19 15:59:52 -04:00
|
|
|
(macroexp--warn-and-return
|
2011-05-22 15:22:30 -03:00
|
|
|
(format "%s quoted with ' rather than with #'"
|
|
|
|
(list 'lambda (nth 1 f) '...))
|
2012-09-19 15:59:52 -04:00
|
|
|
(macroexp--expand-all `(,fun ,arg1 ,f . ,args))))
|
2014-11-09 00:14:25 -05:00
|
|
|
(`(funcall (,(or 'quote 'function) ,(and f (pred symbolp)) . ,_) . ,args)
|
2014-11-05 22:16:41 -05:00
|
|
|
;; Rewrite (funcall #'foo bar) to (foo bar), in case `foo'
|
|
|
|
;; has a compiler-macro.
|
|
|
|
(macroexp--expand-all `(,f . ,args)))
|
2012-06-05 11:41:12 -04:00
|
|
|
(`(,func . ,_)
|
|
|
|
;; Macro expand compiler macros. This cannot be delayed to
|
|
|
|
;; byte-optimize-form because the output of the compiler-macro can
|
|
|
|
;; use macros.
|
2012-07-25 21:27:33 -04:00
|
|
|
(let ((handler (function-get func 'compiler-macro)))
|
2012-06-05 11:41:12 -04:00
|
|
|
(if (null handler)
|
|
|
|
;; No compiler macro. We just expand each argument (for
|
|
|
|
;; setq/setq-default this works alright because the variable names
|
|
|
|
;; are symbols).
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--all-forms form 1)
|
2012-06-08 22:26:47 -04:00
|
|
|
;; If the handler is not loaded yet, try (auto)loading the
|
|
|
|
;; function itself, which may in turn load the handler.
|
2012-07-25 21:27:33 -04:00
|
|
|
(unless (functionp handler)
|
2014-10-31 17:35:35 -04:00
|
|
|
(with-demoted-errors "macroexp--expand-all: %S"
|
2012-07-25 21:27:33 -04:00
|
|
|
(autoload-do-load (indirect-function func) func)))
|
2012-06-14 23:18:14 -04:00
|
|
|
(let ((newform (macroexp--compiler-macro handler form)))
|
2012-06-05 11:41:12 -04:00
|
|
|
(if (eq form newform)
|
|
|
|
;; The compiler macro did not find anything to do.
|
2012-06-06 14:08:00 -04:00
|
|
|
(if (equal form (setq newform (macroexp--all-forms form 1)))
|
2012-06-05 11:41:12 -04:00
|
|
|
form
|
|
|
|
;; Maybe after processing the args, some new opportunities
|
|
|
|
;; appeared, so let's try the compiler macro again.
|
2012-06-14 23:18:14 -04:00
|
|
|
(setq form (macroexp--compiler-macro handler newform))
|
2012-06-05 12:43:43 -04:00
|
|
|
(if (eq newform form)
|
2012-06-05 11:41:12 -04:00
|
|
|
newform
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--expand-all newform)))
|
|
|
|
(macroexp--expand-all newform))))))
|
2012-06-05 11:41:12 -04:00
|
|
|
|
2010-08-28 20:52:36 +02:00
|
|
|
(t form))))
|
2004-02-10 01:52:31 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun macroexpand-all (form &optional environment)
|
|
|
|
"Return result of expanding macros at all levels in FORM.
|
|
|
|
If no macros are expanded, FORM is returned unchanged.
|
|
|
|
The second optional arg ENVIRONMENT specifies an environment of macro
|
|
|
|
definitions to shadow the loaded ones for use in file byte-compilation."
|
|
|
|
(let ((macroexpand-all-environment environment))
|
2012-06-06 14:08:00 -04:00
|
|
|
(macroexp--expand-all form)))
|
2004-02-10 01:52:31 +00:00
|
|
|
|
2012-06-07 15:25:48 -04:00
|
|
|
;;; Handy functions to use in macros.
|
|
|
|
|
|
|
|
(defun macroexp-progn (exps)
|
|
|
|
"Return an expression equivalent to `(progn ,@EXPS)."
|
|
|
|
(if (cdr exps) `(progn ,@exps) (car exps)))
|
|
|
|
|
2012-06-07 22:54:35 -04:00
|
|
|
(defun macroexp-unprogn (exp)
|
|
|
|
"Turn EXP into a list of expressions to execute in sequence."
|
|
|
|
(if (eq (car-safe exp) 'progn) (cdr exp) (list exp)))
|
|
|
|
|
2012-06-07 15:25:48 -04:00
|
|
|
(defun macroexp-let* (bindings exp)
|
|
|
|
"Return an expression equivalent to `(let* ,bindings ,exp)."
|
|
|
|
(cond
|
|
|
|
((null bindings) exp)
|
|
|
|
((eq 'let* (car-safe exp)) `(let* (,@bindings ,@(cadr exp)) ,@(cddr exp)))
|
|
|
|
(t `(let* ,bindings ,exp))))
|
|
|
|
|
|
|
|
(defun macroexp-if (test then else)
|
|
|
|
"Return an expression equivalent to `(if ,test ,then ,else)."
|
|
|
|
(cond
|
|
|
|
((eq (car-safe else) 'if)
|
|
|
|
(if (equal test (nth 1 else))
|
|
|
|
;; Doing a test a second time: get rid of the redundancy.
|
|
|
|
`(if ,test ,then ,@(nthcdr 3 else))
|
|
|
|
`(cond (,test ,then)
|
|
|
|
(,(nth 1 else) ,(nth 2 else))
|
|
|
|
(t ,@(nthcdr 3 else)))))
|
|
|
|
((eq (car-safe else) 'cond)
|
|
|
|
`(cond (,test ,then)
|
|
|
|
;; Doing a test a second time: get rid of the redundancy, as above.
|
|
|
|
,@(remove (assoc test else) (cdr else))))
|
|
|
|
;; Invert the test if that lets us reduce the depth of the tree.
|
|
|
|
((memq (car-safe then) '(if cond)) (macroexp-if `(not ,test) else then))
|
|
|
|
(t `(if ,test ,then ,else))))
|
|
|
|
|
Provide generalized variables in core Elisp.
* lisp/emacs-lisp/gv.el: New file.
* lisp/subr.el (push, pop): Extend to generalized variables.
* lisp/loadup.el (macroexp): Unload if preloaded and uncompiled.
* lisp/emacs-lisp/cl-lib.el (cl-pop, cl-push, cl--set-nthcdr): Remove.
* lisp/emacs-lisp/cl-macs.el: Require gv. Use gv-define-setter,
gv-define-simple-setter, and gv-define-expander.
Remove setf-methods defined in gv. Rename cl-setf -> setf.
(cl-setf, cl-do-pop, cl-get-setf-method): Remove.
(cl-letf, cl-letf*, cl-define-modify-macro, cl-defsetf)
(cl-define-setf-expander, cl-struct-setf-expander): Move to cl.el.
(cl-remf, cl-shiftf, cl-rotatef, cl-callf, cl-callf2): Rewrite with
gv-letplace.
(cl-defstruct): Don't define setf-method any more.
* lisp/emacs-lisp/cl.el (flet): Don't autoload.
(cl--letf, letf, cl--letf*, letf*, cl--gv-adapt)
(define-setf-expander, defsetf, define-modify-macro)
(cl-struct-setf-expander): Move from cl-lib.el.
* lisp/emacs-lisp/syntax.el:
* lisp/emacs-lisp/ewoc.el:
* lisp/emacs-lisp/smie.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/timer.el: Rename cl-setf -> setf, cl-push -> push.
(timer--time): Use gv-define-simple-setter.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Rename from macroexp-let²
to avoid coding-system problems in subr.el. Adjust all users.
(macroexp--maxsize, macroexp-small-p): New functions.
* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't use cl-letf.
* lisp/scroll-bar.el (scroll-bar-mode):
* lisp/simple.el (auto-fill-mode, overwrite-mode, binary-overwrite-mode)
(normal-erase-is-backspace-mode): Don't use the `eq' place.
* lisp/winner.el (winner-configuration, winner-make-point-alist)
(winner-set-conf, winner-get-point, winner-set): Don't abuse letf.
* lisp/files.el (locate-file-completion-table): Avoid list*.
Fixes: debbugs:11657
2012-06-22 09:42:38 -04:00
|
|
|
(defmacro macroexp-let2 (test var exp &rest exps)
|
2012-06-07 15:25:48 -04:00
|
|
|
"Bind VAR to a copyable expression that returns the value of EXP.
|
|
|
|
This is like `(let ((v ,EXP)) ,EXPS) except that `v' is a new generated
|
|
|
|
symbol which EXPS can find in VAR.
|
|
|
|
TEST should be the name of a predicate on EXP checking whether the `let' can
|
|
|
|
be skipped; if nil, as is usual, `macroexp-const-p' is used."
|
2012-06-23 11:38:23 -04:00
|
|
|
(declare (indent 3) (debug (sexp sexp form body)))
|
2012-06-07 15:25:48 -04:00
|
|
|
(let ((bodysym (make-symbol "body"))
|
|
|
|
(expsym (make-symbol "exp")))
|
|
|
|
`(let* ((,expsym ,exp)
|
2012-06-23 11:38:23 -04:00
|
|
|
(,var (if (funcall #',(or test #'macroexp-const-p) ,expsym)
|
2012-07-17 04:15:06 -04:00
|
|
|
,expsym (make-symbol ,(symbol-name var))))
|
2012-06-07 15:25:48 -04:00
|
|
|
(,bodysym ,(macroexp-progn exps)))
|
|
|
|
(if (eq ,var ,expsym) ,bodysym
|
|
|
|
(macroexp-let* (list (list ,var ,expsym))
|
|
|
|
,bodysym)))))
|
|
|
|
|
2014-11-24 22:57:53 +08:00
|
|
|
(defmacro macroexp-let2* (test bindings &rest body)
|
|
|
|
"Bind each binding in BINDINGS as `macroexp-let2' does."
|
|
|
|
(declare (indent 2) (debug (sexp (&rest (sexp form)) body)))
|
|
|
|
(pcase-exhaustive bindings
|
|
|
|
(`nil (macroexp-progn body))
|
|
|
|
(`((,var ,exp) . ,tl)
|
|
|
|
`(macroexp-let2 ,test ,var ,exp
|
|
|
|
(macroexp-let2* ,test ,tl ,@body)))))
|
|
|
|
|
Provide generalized variables in core Elisp.
* lisp/emacs-lisp/gv.el: New file.
* lisp/subr.el (push, pop): Extend to generalized variables.
* lisp/loadup.el (macroexp): Unload if preloaded and uncompiled.
* lisp/emacs-lisp/cl-lib.el (cl-pop, cl-push, cl--set-nthcdr): Remove.
* lisp/emacs-lisp/cl-macs.el: Require gv. Use gv-define-setter,
gv-define-simple-setter, and gv-define-expander.
Remove setf-methods defined in gv. Rename cl-setf -> setf.
(cl-setf, cl-do-pop, cl-get-setf-method): Remove.
(cl-letf, cl-letf*, cl-define-modify-macro, cl-defsetf)
(cl-define-setf-expander, cl-struct-setf-expander): Move to cl.el.
(cl-remf, cl-shiftf, cl-rotatef, cl-callf, cl-callf2): Rewrite with
gv-letplace.
(cl-defstruct): Don't define setf-method any more.
* lisp/emacs-lisp/cl.el (flet): Don't autoload.
(cl--letf, letf, cl--letf*, letf*, cl--gv-adapt)
(define-setf-expander, defsetf, define-modify-macro)
(cl-struct-setf-expander): Move from cl-lib.el.
* lisp/emacs-lisp/syntax.el:
* lisp/emacs-lisp/ewoc.el:
* lisp/emacs-lisp/smie.el:
* lisp/emacs-lisp/cconv.el:
* lisp/emacs-lisp/timer.el: Rename cl-setf -> setf, cl-push -> push.
(timer--time): Use gv-define-simple-setter.
* lisp/emacs-lisp/macroexp.el (macroexp-let2): Rename from macroexp-let²
to avoid coding-system problems in subr.el. Adjust all users.
(macroexp--maxsize, macroexp-small-p): New functions.
* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Don't use cl-letf.
* lisp/scroll-bar.el (scroll-bar-mode):
* lisp/simple.el (auto-fill-mode, overwrite-mode, binary-overwrite-mode)
(normal-erase-is-backspace-mode): Don't use the `eq' place.
* lisp/winner.el (winner-configuration, winner-make-point-alist)
(winner-set-conf, winner-get-point, winner-set): Don't abuse letf.
* lisp/files.el (locate-file-completion-table): Avoid list*.
Fixes: debbugs:11657
2012-06-22 09:42:38 -04:00
|
|
|
(defun macroexp--maxsize (exp size)
|
|
|
|
(cond ((< size 0) size)
|
|
|
|
((symbolp exp) (1- size))
|
|
|
|
((stringp exp) (- size (/ (length exp) 16)))
|
|
|
|
((vectorp exp)
|
|
|
|
(dotimes (i (length exp))
|
|
|
|
(setq size (macroexp--maxsize (aref exp i) size)))
|
|
|
|
(1- size))
|
|
|
|
((consp exp)
|
|
|
|
;; We could try to be more clever with quote&function,
|
|
|
|
;; but it is difficult to do so correctly, and it's not obvious that
|
|
|
|
;; it would be worth the effort.
|
|
|
|
(dolist (e exp)
|
|
|
|
(setq size (macroexp--maxsize e size)))
|
|
|
|
(1- size))
|
|
|
|
(t -1)))
|
|
|
|
|
|
|
|
(defun macroexp-small-p (exp)
|
|
|
|
"Return non-nil if EXP can be considered small."
|
|
|
|
(> (macroexp--maxsize exp 10) 0))
|
|
|
|
|
2012-06-07 15:25:48 -04:00
|
|
|
(defsubst macroexp--const-symbol-p (symbol &optional any-value)
|
|
|
|
"Non-nil if SYMBOL is constant.
|
|
|
|
If ANY-VALUE is nil, only return non-nil if the value of the symbol is the
|
|
|
|
symbol itself."
|
|
|
|
(or (memq symbol '(nil t))
|
|
|
|
(keywordp symbol)
|
|
|
|
(if any-value
|
|
|
|
(or (memq symbol byte-compile-const-variables)
|
|
|
|
;; FIXME: We should provide a less intrusive way to find out
|
|
|
|
;; if a variable is "constant".
|
|
|
|
(and (boundp symbol)
|
|
|
|
(condition-case nil
|
|
|
|
(progn (set symbol (symbol-value symbol)) nil)
|
|
|
|
(setting-constant t)))))))
|
|
|
|
|
|
|
|
(defun macroexp-const-p (exp)
|
|
|
|
"Return non-nil if EXP will always evaluate to the same value."
|
|
|
|
(cond ((consp exp) (or (eq (car exp) 'quote)
|
|
|
|
(and (eq (car exp) 'function)
|
|
|
|
(symbolp (cadr exp)))))
|
|
|
|
;; It would sometimes make sense to pass `any-value', but it's not
|
|
|
|
;; always safe since a "constant" variable may not actually always have
|
|
|
|
;; the same value.
|
|
|
|
((symbolp exp) (macroexp--const-symbol-p exp))
|
|
|
|
(t t)))
|
|
|
|
|
|
|
|
(defun macroexp-copyable-p (exp)
|
|
|
|
"Return non-nil if EXP can be copied without extra cost."
|
|
|
|
(or (symbolp exp) (macroexp-const-p exp)))
|
|
|
|
|
2014-10-25 01:02:25 +02:00
|
|
|
(defun macroexp-quote (v)
|
2014-11-02 01:46:04 -04:00
|
|
|
"Return an expression E such that `(eval E)' is V.
|
2014-10-25 01:02:25 +02:00
|
|
|
|
|
|
|
E is either V or (quote V) depending on whether V evaluates to
|
|
|
|
itself or not."
|
|
|
|
(if (and (not (consp v))
|
|
|
|
(or (keywordp v)
|
|
|
|
(not (symbolp v))
|
|
|
|
(memq v '(nil t))))
|
|
|
|
v
|
|
|
|
(list 'quote v)))
|
|
|
|
|
2012-09-04 13:40:25 -04:00
|
|
|
;;; Load-time macro-expansion.
|
|
|
|
|
|
|
|
;; Because macro-expansion used to be more lazy, eager macro-expansion
|
|
|
|
;; tends to bump into previously harmless/unnoticeable cyclic-dependencies.
|
|
|
|
;; So, we have to delay macro-expansion like we used to when we detect
|
|
|
|
;; such a cycle, and we also want to help coders resolve those cycles (since
|
|
|
|
;; they can be non-obvious) by providing a usefully trimmed backtrace
|
|
|
|
;; (hopefully) highlighting the problem.
|
|
|
|
|
|
|
|
(defun macroexp--backtrace ()
|
|
|
|
"Return the Elisp backtrace, more recent frames first."
|
|
|
|
(let ((bt ())
|
|
|
|
(i 0))
|
|
|
|
(while
|
|
|
|
(let ((frame (backtrace-frame i)))
|
|
|
|
(when frame
|
|
|
|
(push frame bt)
|
|
|
|
(setq i (1+ i)))))
|
|
|
|
(nreverse bt)))
|
|
|
|
|
|
|
|
(defun macroexp--trim-backtrace-frame (frame)
|
|
|
|
(pcase frame
|
|
|
|
(`(,_ macroexpand (,head . ,_) . ,_) `(macroexpand (,head …)))
|
|
|
|
(`(,_ internal-macroexpand-for-load (,head ,second . ,_) . ,_)
|
|
|
|
(if (or (symbolp second)
|
|
|
|
(and (eq 'quote (car-safe second))
|
|
|
|
(symbolp (cadr second))))
|
|
|
|
`(macroexpand-all (,head ,second …))
|
|
|
|
'(macroexpand-all …)))
|
|
|
|
(`(,_ load-with-code-conversion ,name . ,_)
|
|
|
|
`(load ,(file-name-nondirectory name)))))
|
|
|
|
|
|
|
|
(defvar macroexp--pending-eager-loads nil
|
|
|
|
"Stack of files currently undergoing eager macro-expansion.")
|
|
|
|
|
2014-04-22 00:04:34 -07:00
|
|
|
(defun internal-macroexpand-for-load (form full-p)
|
2012-09-04 13:40:25 -04:00
|
|
|
;; Called from the eager-macroexpansion in readevalloop.
|
|
|
|
(cond
|
|
|
|
;; Don't repeat the same warning for every top-level element.
|
|
|
|
((eq 'skip (car macroexp--pending-eager-loads)) form)
|
|
|
|
;; If we detect a cycle, skip macro-expansion for now, and output a warning
|
|
|
|
;; with a trimmed backtrace.
|
|
|
|
((and load-file-name (member load-file-name macroexp--pending-eager-loads))
|
|
|
|
(let* ((bt (delq nil
|
|
|
|
(mapcar #'macroexp--trim-backtrace-frame
|
|
|
|
(macroexp--backtrace))))
|
|
|
|
(elem `(load ,(file-name-nondirectory load-file-name)))
|
|
|
|
(tail (member elem (cdr (member elem bt)))))
|
|
|
|
(if tail (setcdr tail (list '…)))
|
|
|
|
(if (eq (car-safe (car bt)) 'macroexpand-all) (setq bt (cdr bt)))
|
|
|
|
(message "Warning: Eager macro-expansion skipped due to cycle:\n %s"
|
|
|
|
(mapconcat #'prin1-to-string (nreverse bt) " => "))
|
|
|
|
(push 'skip macroexp--pending-eager-loads)
|
|
|
|
form))
|
|
|
|
(t
|
|
|
|
(condition-case err
|
|
|
|
(let ((macroexp--pending-eager-loads
|
|
|
|
(cons load-file-name macroexp--pending-eager-loads)))
|
2014-04-22 00:04:34 -07:00
|
|
|
(if full-p
|
|
|
|
(macroexpand-all form)
|
|
|
|
(macroexpand form)))
|
2012-09-04 13:40:25 -04:00
|
|
|
(error
|
|
|
|
;; Hopefully this shouldn't happen thanks to the cycle detection,
|
|
|
|
;; but in case it does happen, let's catch the error and give the
|
|
|
|
;; code a chance to macro-expand later.
|
|
|
|
(message "Eager macro-expansion failure: %S" err)
|
|
|
|
form)))))
|
|
|
|
|
|
|
|
;; ¡¡¡ Big Ugly Hack !!!
|
|
|
|
;; src/bootstrap-emacs is mostly used to compile .el files, so it needs
|
|
|
|
;; macroexp, bytecomp, cconv, and byte-opt to be fast. Generally this is done
|
|
|
|
;; by compiling those files first, but this only makes a difference if those
|
|
|
|
;; files are not preloaded. But macroexp.el is preloaded so we reload it if
|
|
|
|
;; the current version is interpreted and there's a compiled version available.
|
|
|
|
(eval-when-compile
|
|
|
|
(add-hook 'emacs-startup-hook
|
|
|
|
(lambda ()
|
|
|
|
(and (not (byte-code-function-p
|
|
|
|
(symbol-function 'macroexpand-all)))
|
|
|
|
(locate-library "macroexp.elc")
|
|
|
|
(load "macroexp.elc")))))
|
|
|
|
|
2004-02-10 01:52:31 +00:00
|
|
|
(provide 'macroexp)
|
|
|
|
|
|
|
|
;;; macroexp.el ends here
|