Commit 53aacf21 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Tolerate errors during

compiler-macro expansion.
parent 57a7d507
2012-06-05 Stefan Monnier <>
* emacs-lisp/macroexp.el (macroexpand-all-1): Tolerate errors during
compiler-macro expansion.
Add native compiler-macro support.
* emacs-lisp/macroexp.el (macroexpand-all-1):
Support compiler-macros directly. Properly follow aliases and apply
......@@ -289,7 +289,7 @@ This also does some trivial optimizations to make the form prettier.
;;;;;; cl-return cl-block cl-etypecase cl-typecase cl-ecase cl-case
;;;;;; cl-load-time-value cl-eval-when cl-destructuring-bind cl-function
;;;;;; cl-defmacro cl-defun cl-gentemp cl-gensym) "cl-macs" "cl-macs.el"
;;;;;; "35e128b3ab7780c4f9c25da5a0adea7a")
;;;;;; "f3973150add70d26cadb8530147dfc99")
;;; Generated autoloads from cl-macs.el
(autoload 'cl-gensym "cl-macs" "\
......@@ -187,7 +187,8 @@ Assumes the caller has bound `macroexpand-all-environment'."
(fboundp func)
(or (not (eq (car-safe (symbol-function func))
(load (nth 1 (symbol-function func)))))
(load (nth 1 (symbol-function func))))))
;; Follow the sequence of aliases.
(setq func (symbol-function func)))
(if (null handler)
......@@ -195,15 +196,21 @@ Assumes the caller has bound `macroexpand-all-environment'."
;; setq/setq-default this works alright because the variable names
;; are symbols).
(macroexpand-all-forms form 1)
(let ((newform (apply handler form (cdr form))))
(let ((newform (condition-case err
(apply handler form (cdr form))
(error (message "Compiler-macro error: %S" err)
(if (eq form newform)
;; The compiler macro did not find anything to do.
(if (equal form (setq newform (macroexpand-all-forms form 1)))
;; Maybe after processing the args, some new opportunities
;; appeared, so let's try the compiler macro again.
(if (eq newform
(setq form (apply handler newform (cdr newform))))
(setq form (condition-case err
(apply handler newform (cdr newform))
(error (message "Compiler-macro error: %S" err)
(if (eq newform form)
(macroexpand-all-1 newform)))
(macroexpand-all-1 newform))))))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment