X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Feval.lisp;h=da49162b697841e4fc4ed43dc515fbd0169702a1;hb=5277a0cbf1a72243cad6808883a4847acefc8e6b;hp=36531a5d3c3e70075b7b2fa8f380a590a0da0fa8;hpb=dec94b039e8ec90baf21463df839a6181de606f6;p=sbcl.git

diff --git a/src/code/eval.lisp b/src/code/eval.lisp
index 36531a5..da49162 100644
--- 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
@@ -164,9 +164,9 @@
   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))))
@@ -177,7 +177,7 @@
                 ((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))))))