X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fcombin.lisp;h=76746897f06ba462d4f69171bef52c20ba8897fe;hb=683874b497a99cd2c11b6c5d9b47e2785b1ede5f;hp=2ca53ccf3d856576ae6b7ba505d24cc4f334935a;hpb=f2aa2d01b8d69f1c7bff18f86279d4f1018fe127;p=sbcl.git

diff --git a/src/pcl/combin.lisp b/src/pcl/combin.lisp
index 2ca53cc..7674689 100644
--- a/src/pcl/combin.lisp
+++ b/src/pcl/combin.lisp
@@ -64,8 +64,10 @@
       (make-effective-method-function-internal generic-function form
 					       method-alist-p wrappers-p)))
 
-(defun make-effective-method-function-type (generic-function form
-					    method-alist-p wrappers-p)
+(defun make-effective-method-fun-type (generic-function
+				       form
+				       method-alist-p
+				       wrappers-p)
   (if (and (listp form)
 	   (eq (car form) 'call-method))
       (let* ((cm-args (cdr form))
@@ -86,7 +88,7 @@
 			  'fast-method-call
 			  'method-call))))
 	      (if (and (consp method) (eq (car method) 'make-method))
-		  (make-effective-method-function-type
+		  (make-effective-method-fun-type
 		   generic-function (cadr method) method-alist-p wrappers-p)
 		  (type-of method)))))
       'fast-method-call))
@@ -186,7 +188,7 @@
 
 (defun memf-test-converter (form generic-function method-alist-p wrappers-p)
   (cond ((and (consp form) (eq (car form) 'call-method))
-	 (case (make-effective-method-function-type
+	 (case (make-effective-method-fun-type
 		generic-function form method-alist-p wrappers-p)
 	   (fast-method-call
 	    '.fast-call-method.)
@@ -195,7 +197,7 @@
 	((and (consp form) (eq (car form) 'call-method-list))
 	 (case (if (every #'(lambda (form)
 			      (eq 'fast-method-call
-				  (make-effective-method-function-type
+				  (make-effective-method-fun-type
 				   generic-function form
 				   method-alist-p wrappers-p)))
 			  (cdr form))
@@ -213,14 +215,14 @@
   (cond ((and (consp form) (eq (car form) 'call-method))
 	 (let ((gensym (get-effective-method-gensym)))
 	   (values (make-emf-call metatypes applyp gensym
-				  (make-effective-method-function-type
+				  (make-effective-method-fun-type
 				   generic-function form method-alist-p wrappers-p))
 		   (list gensym))))
 	((and (consp form) (eq (car form) 'call-method-list))
 	 (let ((gensym (get-effective-method-gensym))
 	       (type (if (every #'(lambda (form)
 				    (eq 'fast-method-call
-					(make-effective-method-function-type
+					(make-effective-method-fun-type
 					 generic-function form
 					 method-alist-p wrappers-p)))
 				(cdr form))
@@ -287,7 +289,7 @@
 				      (t constant))
 				    constant))
 			    constants))
-		   (function (set-function-name
+		   (function (set-fun-name
 			      (apply cfunction constants)
 			      `(combined-method ,name))))
 	      (make-fast-method-call :function function
@@ -374,7 +376,7 @@
 				     applicable-methods))
 
 (defun invalid-method-error (method format-control &rest format-arguments)
-  (error "~@<invalid method error for ~2I_~S ~I~_method: ~2I~_~?~:>"
+  (error "~@<invalid method error for ~2I~_~S ~I~_method: ~2I~_~?~:>"
 	 method
 	 format-control
 	 format-arguments))