0.7.3.4:

[sbcl.git] / src / code / eval.lisp

diff --git a/src/code/eval.lisp b/src/code/eval.lisp
index 36531a5..6e8b10f 100644 (file)
--- a/src/code/eval.lisp
+++ b/src/code/eval.lisp
@@ -55,7 +55,7 @@
        (eval (first i))
        (return (eval (first i))))))
 
-;;; Pick off a few easy cases, and the various top-level EVAL-WHEN
+;;; Pick off a few easy cases, and the various top level EVAL-WHEN
 ;;; magical cases, and call %EVAL for the rest. 
 (defun eval (original-exp)
   #!+sb-doc
@@ -112,8 +112,8 @@
                     (set (first args) (eval (second args)))))
                (let ((symbol (first name)))
                  (case (info :variable :kind symbol)
-                   ;; FIXME: I took out the *TOP-LEVEL-AUTO-DECLARE*
-                   ;; test here, and removed the *TOP-LEVEL-AUTO-DECLARE*
+                   ;; FIXME: I took out the *TOPLEVEL-AUTO-DECLARE*
+                   ;; test here, and removed the *TOPLEVEL-AUTO-DECLARE*
                    ;; variable; the code should now act as though that
                    ;; variable is NIL. This should be tested..
                    (:special)
@@ -121,14 +121,14 @@
           ((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
@@ -156,32 +156,6 @@
                (%eval original-exp))))))
       (t
        exp))))
-
-(defun function-lambda-expression (fun)
-  "Return (VALUES DEFINING-LAMBDA-EXPRESSION CLOSURE-P NAME), where
-  DEFINING-LAMBDA-EXPRESSION is NIL if unknown, or a suitable argument
-  to COMPILE otherwise, CLOSURE-P is non-NIL if the function's definition
-  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))
-          (info (sb!kernel:%code-debug-info code)))
-      (if info
-        (let ((source (first (sb!c::compiled-debug-info-source info))))
-          (cond ((and (eq (sb!c::debug-source-from source) :lisp)
-                      (eq (sb!c::debug-source-info source) fun))
-                 (values (second (svref (sb!c::debug-source-name source) 0))
-                         nil name))
-                ((stringp name)
-                 (values nil t name))
-                (t
-                 (let ((exp (info :function :inline-expansion name)))
-                   (if exp
-                       (values exp nil name)
-                       (values nil t name))))))
-        (values nil t name))))
 \f
 ;;; miscellaneous full function definitions of things which are
 ;;; ordinarily handled magically by the compiler