((progn)
(eval-progn-body (rest exp)))
((eval-when)
- ;; FIXME: DESTRUCTURING-BIND returns
- ;; DEFMACRO-LL-ARG-COUNT-ERROR instead of PROGRAM-ERROR
- ;; when there's something wrong with the syntax here (e.g.
- ;; missing SITUATIONS). This could be fixed by
- ;; hand-crafting clauses to catch and report each
- ;; possibility, but it would probably be cleaner to write
- ;; a new macro DESTRUCTURING-BIND-PROGRAM-SYNTAX which
- ;; does DESTRUCTURING-BIND and promotes any mismatch to
+ ;; FIXME: DESTRUCTURING-BIND returns ARG-COUNT-ERROR
+ ;; instead of PROGRAM-ERROR when there's something wrong
+ ;; with the syntax here (e.g. missing SITUATIONS). This
+ ;; could be fixed by hand-crafting clauses to catch and
+ ;; report each possibility, but it would probably be
+ ;; cleaner to write a new macro
+ ;; DESTRUCTURING-BIND-PROGRAM-SYNTAX which does
+ ;; DESTRUCTURING-BIND and promotes any mismatch to
;; PROGRAM-ERROR, then to use it here and in (probably
;; dozens of) other places where the same problem arises.
(destructuring-bind (eval-when situations &rest body) exp
might have been enclosed in some non-null lexical environment, and
NAME is some name (for debugging only) or NIL if there is no name."
(declare (type function fun))
- (let* ((fun (%function-self fun))
- (name (%function-name fun))
- (code (sb!di::function-code-header fun))
+ (let* ((fun (%simple-fun-self fun))
+ (name (%simple-fun-name fun))
+ (code (sb!di::fun-code-header fun))
(info (sb!kernel:%code-debug-info code)))
(if info
(let ((source (first (sb!c::compiled-debug-info-source info))))
((stringp name)
(values nil t name))
(t
- (let ((exp (info :function :inline-expansion name)))
+ (let ((exp (fun-name-inline-expansion name)))
(if exp
(values exp nil name)
(values nil t name))))))