X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fcombin.lisp;h=47b78446c99352969bde5b23591da34fdfcc3480;hb=a260738d7a71680079d972b102b4e4db4e8dc3ae;hp=6ab148a3eaf98abd0be0f6ef44a221bab4aad1d0;hpb=f6a2be77637d025bfded9430f02863c28f74f77a;p=sbcl.git diff --git a/src/pcl/combin.lisp b/src/pcl/combin.lisp index 6ab148a..47b7844 100644 --- a/src/pcl/combin.lisp +++ b/src/pcl/combin.lisp @@ -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. ;; @@ -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)) @@ -344,16 +344,17 @@ `(error "There is no primary method for the generic function ~S." ',generic-function)) ((and (null before) (null after) (null around)) - ;; By returning a single call-method `form' here we enable an - ;; important implementation-specific optimization. + ;; By returning a single call-method `form' here we enable + ;; an important implementation-specific optimization. `(call-method ,(first primary) ,(rest primary))) (t (let ((main-effective-method (if (or before after) `(multiple-value-prog1 - (progn ,(make-call-methods before) - (call-method ,(first primary) - ,(rest primary))) + (progn + ,(make-call-methods before) + (call-method ,(first primary) + ,(rest primary))) ,(make-call-methods (reverse after))) `(call-method ,(first primary) ,(rest primary))))) (if around