(I didn't have convenient access to the Internet for almost a week, so

[sbcl.git] / src / pcl / combin.lisp

diff --git a/src/pcl/combin.lisp b/src/pcl/combin.lisp
index 0a7c7d6..3429ad7 100644 (file)
--- a/src/pcl/combin.lisp
+++ b/src/pcl/combin.lisp
@@ -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
@@ -95,7 +95,7 @@
 
 (defun make-effective-method-function-simple
     (generic-function form &optional no-fmf-p)
-  ;; The effective method is just a call to call-method. This opens up
+  ;; The effective method is just a call to CALL-METHOD. This opens up
   ;; the possibility of just using the method function of the method as
   ;; the effective method function.
   ;;
@@ -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
@@ -179,8 +179,8 @@
          ;; args are not used giving a compiler warning.
          (error-p (eq (first effective-method) 'error)))
       `(lambda ,ll
-        (declare (ignore ,@(if error-p ll '(.pv-cell. .next-method-call.))))
-        ,effective-method))))
+       (declare (ignore ,@(if error-p ll '(.pv-cell. .next-method-call.))))
+       ,effective-method))))
 
 (defun expand-emf-call-method (gf form metatypes applyp env)
   (declare (ignore gf metatypes applyp env))
@@ -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*)