X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fcombin.lisp;h=6ab148a3eaf98abd0be0f6ef44a221bab4aad1d0;hb=f6a2be77637d025bfded9430f02863c28f74f77a;hp=610011ba4cd4ec3e8dead76b6c98b03add21fca0;hpb=ed7ba4dad8a79726fdfeba5aa12e276ea852c540;p=sbcl.git

diff --git a/src/pcl/combin.lisp b/src/pcl/combin.lisp
index 610011b..6ab148a 100644
--- a/src/pcl/combin.lisp
+++ b/src/pcl/combin.lisp
@@ -60,7 +60,7 @@
       (make-effective-method-function-simple generic-function form)
       ;; We have some sort of `real' effective method. Go off and get a
       ;; compiled function for it. Most of the real hair here is done by
-      ;; the GET-FUNCTION mechanism.
+      ;; the GET-FUN mechanism.
       (make-effective-method-function-internal generic-function form
 					       method-alist-p wrappers-p)))
 
@@ -74,7 +74,7 @@
 	     (method (car cm-args)))
 	(when method
 	  (if (if (listp method)
-		  (eq (car method) ':early-method)
+		  (eq (car method) :early-method)
 		  (method-p method))
 	      (if method-alist-p
 		  t
@@ -129,7 +129,7 @@
 		      gf (car next-methods)
 		      (list* (cdr next-methods) (cdr cm-args))
 		      fmf-p method-alist wrappers))
-	       (arg-info (method-function-get fmf ':arg-info)))
+	       (arg-info (method-function-get fmf :arg-info)))
 	  (make-fast-method-call :function fmf
 				 :pv-cell pv-cell
 				 :next-method-call next
@@ -143,7 +143,7 @@
     (gf method cm-args fmf-p &optional method-alist wrappers)
   (when method
     (if (if (listp method)
-	    (eq (car method) ':early-method)
+	    (eq (car method) :early-method)
 	    (method-p method))
 	(make-emf-from-method method cm-args gf fmf-p method-alist wrappers)
 	(if (and (consp method) (eq (car method) 'make-method))
@@ -171,7 +171,7 @@
 (defun expand-effective-method-function (gf effective-method &optional env)
   (declare (ignore env))
   (multiple-value-bind (nreq applyp metatypes nkeys arg-info)
-      (get-generic-function-info gf)
+      (get-generic-fun-info gf)
     (declare (ignore nreq nkeys arg-info))
     (let ((ll (make-fast-method-call-lambda-list metatypes applyp))
 	  ;; When there are no primary methods and a next-method call occurs
@@ -255,7 +255,7 @@
 (defun make-effective-method-function-internal
     (generic-function effective-method method-alist-p wrappers-p)
   (multiple-value-bind (nreq applyp metatypes nkeys arg-info)
-      (get-generic-function-info generic-function)
+      (get-generic-fun-info generic-function)
     (declare (ignore nkeys arg-info))
     (let* ((*rebound-effective-method-gensyms*
 	    *global-effective-method-gensyms*)
@@ -266,16 +266,16 @@
 	   (effective-method-lambda (expand-effective-method-function
 				     generic-function effective-method)))
       (multiple-value-bind (cfunction constants)
-	  (get-function1 effective-method-lambda
-			 (lambda (form)
-			   (memf-test-converter form generic-function
-						method-alist-p wrappers-p))
-			 (lambda (form)
-			   (memf-code-converter form generic-function
-						metatypes applyp
-						method-alist-p wrappers-p))
-			 (lambda (form)
-			   (memf-constant-converter form generic-function)))
+	  (get-fun1 effective-method-lambda
+		    (lambda (form)
+		      (memf-test-converter form generic-function
+					   method-alist-p wrappers-p))
+		    (lambda (form)
+		      (memf-code-converter form generic-function
+					   metatypes applyp
+					   method-alist-p wrappers-p))
+		    (lambda (form)
+		      (memf-constant-converter form generic-function)))
 	(lambda (method-alist wrappers)
 	  (let* ((constants
 		  (mapcar (lambda (constant)