X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fdefboot.lisp;h=89c3111b392fa6c7d1d0670ec699b7d7bf2d6f63;hb=4cf50b1896b25f5337e7c258b0b560da00d47993;hp=00ca92d1a616fa57856ee0e993802ad771f483c3;hpb=a26fc2e03904bd0dac626a43e169e2e3514344d4;p=sbcl.git diff --git a/src/code/defboot.lisp b/src/code/defboot.lisp index 00ca92d..89c3111 100644 --- a/src/code/defboot.lisp +++ b/src/code/defboot.lisp @@ -26,7 +26,7 @@ `(eval-when (:compile-toplevel :load-toplevel :execute) (setq *package* (find-undeleted-package-or-lose ',package-designator)))) -;;; MULTIPLE-VALUE-FOO +;;;; MULTIPLE-VALUE-FOO (defun list-of-symbols-p (x) (and (listp x) @@ -169,12 +169,7 @@ (if (and (consp name) (eq (first name) 'setf)) (setf (fdocumentation (second name) 'setf) doc) (setf (fdocumentation name 'function) doc))) - (sb!c::proclaim-as-function-name name) - (if (eq (info :function :where-from name) :assumed) - (progn - (setf (info :function :where-from name) :defined) - (if (info :function :assumed-type name) - (setf (info :function :assumed-type name) nil)))) + (become-defined-function-name name) (when (or inline-expansion (info :function :inline-expansion name)) (setf (info :function :inline-expansion name) @@ -190,6 +185,16 @@ (defun sb!c::%defun (name def doc source) (declare (ignore source)) (setf (sb!eval:interpreted-function-name def) name) + (ecase (info :function :where-from name) + (:assumed + (setf (info :function :where-from name) :defined) + (setf (info :function :type name) + (extract-function-type def)) + (when (info :function :assumed-type name) + (setf (info :function :assumed-type name) nil))) + (:declared) + (:defined + (setf (info :function :type name) (extract-function-type def)))) (sb!c::%%defun name def doc)) ;;;; DEFVAR and DEFPARAMETER