X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffdefinition.lisp;h=e4634f8b38e29a717eb4ef0ebf2b3db6a7cf9da7;hb=2da80a5263e44a824675283340b2253db2348f5e;hp=fd0fdd57fc7e41dcede3d0c7ea4a9cae9ee3d674;hpb=ffe8d65266ed7c2c67a0a6ce7ff0de633000037e;p=sbcl.git

diff --git a/src/code/fdefinition.lisp b/src/code/fdefinition.lisp
index fd0fdd5..e4634f8 100644
--- a/src/code/fdefinition.lisp
+++ b/src/code/fdefinition.lisp
@@ -54,12 +54,7 @@
 ;;; CREATE is non-NIL, create a new (unbound) one.
 (defun fdefinition-object (name create)
   (declare (values (or fdefn null)))
-  (unless (legal-fun-name-p name)
-    (error 'simple-type-error
-	   :datum name
-	   :expected-type '(or symbol list)
-	   :format-control "invalid function name: ~S"
-	   :format-arguments (list name)))
+  (legal-fun-name-or-type-error name)
   (let ((fdefn (info :function :definition name)))
     (if (and (null fdefn) create)
 	(setf (info :function :definition name) (make-fdefn name))
@@ -88,7 +83,7 @@
 					     (type definition))
 			       (:copier nil))
   ;; This is definition's encapsulation type. The encapsulated
-  ;; definition is in the previous encapsulation-info element or
+  ;; definition is in the previous ENCAPSULATION-INFO element or
   ;; installed as the global definition of some function name.
   type
   ;; the previous, encapsulated definition. This used to be installed
@@ -117,7 +112,7 @@
     ;; an encapsulation that no longer exists.
     (let ((info (make-encapsulation-info type (fdefn-fun fdefn))))
       (setf (fdefn-fun fdefn)
-	    (lambda (&rest arg-list)
+	    (named-lambda encapsulate (&rest arg-list)
 	      (declare (special arg-list))
 	      (let ((basic-definition (encapsulation-info-definition info)))
 		(declare (special basic-definition))
@@ -126,6 +121,7 @@
 ;;; This is like FIND-IF, except that we do it on a compiled closure's
 ;;; environment.
 (defun find-if-in-closure (test fun)
+  (declare (type function test))
   (dotimes (index (1- (get-closure-length fun)))
     (let ((elt (%closure-index-ref fun index)))
       (when (funcall test elt)
@@ -139,7 +135,7 @@
 
 ;;; When removing an encapsulation, we must remember that
 ;;; encapsulating definitions close over a reference to the
-;;; encapsulation-info that describes the encapsulating definition.
+;;; ENCAPSULATION-INFO that describes the encapsulating definition.
 ;;; When you find an info with the target type, the previous info in
 ;;; the chain has the ensulating definition of that type. We take the
 ;;; encapsulated definition from the info with the target type, and we
@@ -231,8 +227,8 @@
 
 (defvar *setf-fdefinition-hook* nil
   #!+sb-doc
-  "This holds functions that (SETF FDEFINITION) invokes before storing the
-   new value. These functions take the function name and the new value.")
+  "A list of functions that (SETF FDEFINITION) invokes before storing the
+   new value. The functions take the function name and the new value.")
 
 (defun %set-fdefinition (name new-value)
   #!+sb-doc
@@ -243,6 +239,7 @@
     ;; top level forms in the kernel core startup.
     (when (boundp '*setf-fdefinition-hook*)
       (dolist (f *setf-fdefinition-hook*)
+        (declare (type function f))
 	(funcall f name new-value)))
 
     (let ((encap-info (encapsulation-info (fdefn-fun fdefn))))