X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fboot.lisp;h=562ff1d6c9b11facb18cdcc2e3a51ca1ac20d909;hb=8160f3ac81fff66563276cfbc7546d43891dae5c;hp=61bb5f99daad12e10de30ecbbb5d370cfd750d42;hpb=2217cdb364e8b48c187b085895bb2a5cbdbd9622;p=sbcl.git

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index 61bb5f9..562ff1d 100644
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -221,16 +221,16 @@ bootstrapping.
 	 #',fun-name))))
 
 (defun compile-or-load-defgeneric (fun-name)
-  (sb-kernel:proclaim-as-fun-name fun-name)
-  (sb-kernel:note-name-defined fun-name :function)
+  (proclaim-as-fun-name fun-name)
+  (note-name-defined fun-name :function)
   (unless (eq (info :function :where-from fun-name) :declared)
     (setf (info :function :where-from fun-name) :defined)
     (setf (info :function :type fun-name)
-	  (sb-kernel:specifier-type 'function))))
+	  (specifier-type 'function))))
 
 (defun load-defgeneric (fun-name lambda-list &rest initargs)
   (when (fboundp fun-name)
-    (sb-kernel::style-warn "redefining ~S in DEFGENERIC" fun-name)
+    (style-warn "redefining ~S in DEFGENERIC" fun-name)
     (let ((fun (fdefinition fun-name)))
       (when (generic-function-p fun)
         (loop for method in (generic-function-initial-methods fun)
@@ -1310,8 +1310,8 @@ bootstrapping.
                                      (parse-specializers specializers)
 				     nil))))
       (when method
-	(sb-kernel::style-warn "redefining ~S~{ ~S~} ~S in DEFMETHOD"
-			       gf-spec qualifiers specializers))))
+	(style-warn "redefining ~S~{ ~S~} ~S in DEFMETHOD"
+		    gf-spec qualifiers specializers))))
   (let ((method (apply #'add-named-method
 		       gf-spec qualifiers specializers lambda-list
 		       :definition-source `((defmethod ,gf-spec
@@ -1439,15 +1439,15 @@ bootstrapping.
       (analyze-lambda-list lambda-list)
     (declare (ignore keyword-parameters))
     (let* ((old (info :function :type name)) ;FIXME:FDOCUMENTATION instead?
-	   (old-ftype (if (sb-kernel:fun-type-p old) old nil))
-	   (old-restp (and old-ftype (sb-kernel:fun-type-rest old-ftype)))
+	   (old-ftype (if (fun-type-p old) old nil))
+	   (old-restp (and old-ftype (fun-type-rest old-ftype)))
 	   (old-keys (and old-ftype
-			  (mapcar #'sb-kernel:key-info-name
-				  (sb-kernel:fun-type-keywords
+			  (mapcar #'key-info-name
+				  (fun-type-keywords
 				   old-ftype))))
-	   (old-keysp (and old-ftype (sb-kernel:fun-type-keyp old-ftype)))
+	   (old-keysp (and old-ftype (fun-type-keyp old-ftype)))
 	   (old-allowp (and old-ftype
-			    (sb-kernel:fun-type-allowp old-ftype)))
+			    (fun-type-allowp old-ftype)))
 	   (keywords (union old-keys (mapcar #'keyword-spec-name keywords))))
       `(function ,(append (make-list nrequired :initial-element t)
 			  (when (plusp noptional)
@@ -1773,14 +1773,14 @@ bootstrapping.
 (defun make-early-gf (spec &optional lambda-list lambda-list-p
 		      function argument-precedence-order)
   (let ((fin (allocate-funcallable-instance *sgf-wrapper* *sgf-slots-init*)))
-    (set-funcallable-instance-fun
+    (set-funcallable-instance-function
      fin
      (or function
 	 (if (eq spec 'print-object)
-	     #'(sb-kernel:instance-lambda (instance stream)
+	     #'(instance-lambda (instance stream)
 		 (print-unreadable-object (instance stream :identity t)
 		   (format stream "std-instance")))
-	     #'(sb-kernel:instance-lambda (&rest args)
+	     #'(instance-lambda (&rest args)
 		 (declare (ignore args))
 		 (error "The function of the funcallable-instance ~S~
 			 has not been set." fin)))))