X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fmethods.lisp;h=5fd798fd5eaf7d37ada9fba124285a83bcf6f521;hb=3d9d3088982414ca5617caf62bd37b4fecac29b6;hp=a08b5000eb5686e313b79166b6286f99324b9e42;hpb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;p=sbcl.git

diff --git a/src/pcl/methods.lisp b/src/pcl/methods.lisp
index a08b500..5fd798f 100644
--- a/src/pcl/methods.lisp
+++ b/src/pcl/methods.lisp
@@ -297,8 +297,8 @@
 			      &rest other-initargs)
   (unless (and (fboundp generic-function-name)
 	       (typep (fdefinition generic-function-name) 'generic-function))
-    (sb-kernel::style-warn "implicitly creating new generic function ~S"
-			   generic-function-name))
+    (style-warn "implicitly creating new generic function ~S"
+		generic-function-name))
   ;; XXX What about changing the class of the generic function if
   ;; there is one? Whose job is that, anyway? Do we need something
   ;; kind of like CLASS-FOR-REDEFINITION?
@@ -916,7 +916,7 @@
 				      ((eq valuep :constant-value)
 				       (value-for-caching generic-function
 							  classes)))))
-		     (setq cache (fill-cache cache wrappers value t))))))))
+		     (setq cache (fill-cache cache wrappers value))))))))
       (if classes-list
 	  (mapc #'add-class-list classes-list)
 	  (dolist (method (generic-function-methods generic-function))
@@ -929,8 +929,8 @@
   (cond ((eq class *the-class-t*)
 	 t)
 	((eq class *the-class-slot-object*)
-	 `(not (typep (sb-kernel:classoid-of ,arg)
-		      'sb-kernel:built-in-classoid)))
+	 `(not (typep (classoid-of ,arg)
+		      'built-in-classoid)))
 	((eq class *the-class-std-object*)
 	 `(or (std-instance-p ,arg) (fsc-instance-p ,arg)))
 	((eq class *the-class-standard-object*)
@@ -1286,7 +1286,7 @@
 			(make-fast-method-call-lambda-list metatypes applyp))))
       (multiple-value-bind (cfunction constants)
 	  (get-fun1 `(,(if function-p
-			   'sb-kernel:instance-lambda
+			   'instance-lambda
 			   'lambda)
 		      ,arglist
 		      ,@(unless function-p
@@ -1345,12 +1345,12 @@
 ;;; the funcallable instance function of the generic function for which
 ;;; it was computed.
 ;;;
-;;; More precisely, if compute-discriminating-function is called with an
-;;; argument <gf1>, and returns a result <df1>, that result must not be
-;;; passed to apply or funcall directly. Rather, <df1> must be stored as
-;;; the funcallable instance function of the same generic function <gf1>
-;;; (using set-funcallable-instance-fun). Then the generic function
-;;; can be passed to funcall or apply.
+;;; More precisely, if compute-discriminating-function is called with
+;;; an argument <gf1>, and returns a result <df1>, that result must
+;;; not be passed to apply or funcall directly. Rather, <df1> must be
+;;; stored as the funcallable instance function of the same generic
+;;; function <gf1> (using SET-FUNCALLABLE-INSTANCE-FUNCTION). Then the
+;;; generic function can be passed to funcall or apply.
 ;;;
 ;;; An important exception is that methods on this generic function are
 ;;; permitted to return a function which itself ends up calling the value
@@ -1391,7 +1391,7 @@
 ;;;     (lambda (arg)
 ;;;	 (cond (<some condition>
 ;;;		<store some info in the generic function>
-;;;		(set-funcallable-instance-fun
+;;;		(set-funcallable-instance-function
 ;;;		  gf
 ;;;		  (compute-discriminating-function gf))
 ;;;		(funcall gf arg))
@@ -1403,7 +1403,7 @@
 ;;;   (defmethod compute-discriminating-function ((gf my-generic-function))
 ;;;     (lambda (arg)
 ;;;	 (cond (<some condition>
-;;;		(set-funcallable-instance-fun
+;;;		(set-funcallable-instance-function
 ;;;		  gf
 ;;;		  (lambda (a) ..))
 ;;;		(funcall gf arg))