0.7.1.3:

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

diff --git a/src/pcl/defcombin.lisp b/src/pcl/defcombin.lisp
index 536d1ce..8c4bd49 100644 (file)
--- a/src/pcl/defcombin.lisp
+++ b/src/pcl/defcombin.lisp
@@ -87,20 +87,20 @@
            :qualifiers ()
            :specializers specializers
            :lambda-list '(generic-function type options)
-           :function #'(lambda(args nms &rest cm-args)
-                         (declare (ignore nms cm-args))
-                         (apply
-                          #'(lambda (gf type options)
-                              (declare (ignore gf))
-                              (do-short-method-combination
-                               type options operator ioa new-method doc))
-                          args))
+           :function (lambda (args nms &rest cm-args)
+                       (declare (ignore nms cm-args))
+                       (apply
+                        (lambda (gf type options)
+                          (declare (ignore gf))
+                          (short-combine-methods
+                           type options operator ioa new-method doc))
+                        args))
            :definition-source `((define-method-combination ,type) ,truename)))
     (when old-method
       (remove-method #'find-method-combination old-method))
     (add-method #'find-method-combination new-method)))
 
-(defun do-short-method-combination (type options operator ioa method doc)
+(defun short-combine-methods (type options operator ioa method doc)
   (cond ((null options) (setq options '(:most-specific-first)))
        ((equal options '(:most-specific-first)))
        ((equal options '(:most-specific-last)))
@@ -153,7 +153,7 @@
            (if (and (null (cdr primary))
                     (not (null ioa)))
                `(call-method ,(car primary) ())
-               `(,operator ,@(mapcar #'(lambda (m) `(call-method ,m ()))
+               `(,operator ,@(mapcar (lambda (m) `(call-method ,m ()))
                                      primary)))))
       (cond ((null primary)
             `(error "No ~S methods for the generic function ~S."
@@ -174,15 +174,15 @@
        (lambda-list (caddr form))
        (method-group-specifiers (cadddr form))
        (body (cddddr form))
-       (arguments-option ())
+       (args-option ())
        (gf-var nil))
     (when (and (consp (car body)) (eq (caar body) :arguments))
-      (setq arguments-option (cdr (pop body))))
+      (setq args-option (cdr (pop body))))
     (when (and (consp (car body)) (eq (caar body) :generic-function))
       (setq gf-var (cadr (pop body))))
     (multiple-value-bind (documentation function)
        (make-long-method-combination-function
-         type lambda-list method-group-specifiers arguments-option gf-var
+         type lambda-list method-group-specifiers args-option gf-var
          body)
       `(load-long-defcombin ',type ',documentation #',function))))
 
@@ -200,16 +200,16 @@
             :qualifiers ()
             :specializers specializers
             :lambda-list '(generic-function type options)
-            :function #'(lambda (args nms &rest cm-args)
-                          (declare (ignore nms cm-args))
-                          (apply
-                           #'(lambda (generic-function type options)
-                               (declare (ignore generic-function options))
-                               (make-instance 'long-method-combination
-                                              :type type
-                                              :documentation doc))
-                           args))
-        :definition-source `((define-method-combination ,type)
+            :function (lambda (args nms &rest cm-args)
+                        (declare (ignore nms cm-args))
+                        (apply
+                         (lambda (generic-function type options)
+                           (declare (ignore generic-function options))
+                           (make-instance 'long-method-combination
+                                          :type type
+                                          :documentation doc))
+                         args))
+            :definition-source `((define-method-combination ,type)
                              ,*load-truename*))))
     (setf (gethash type *long-method-combination-functions*) function)
     (when old-method (remove-method #'find-method-combination old-method))
@@ -225,7 +225,7 @@
           applicable-methods))
 
 (defun make-long-method-combination-function
-       (type ll method-group-specifiers arguments-option gf-var body)
+       (type ll method-group-specifiers args-option gf-var body)
   ;;(declare (values documentation function))
   (declare (ignore type))
   (multiple-value-bind (documentation declarations real-body)
@@ -238,9 +238,8 @@
       (when gf-var
        (push `(,gf-var .generic-function.) (cadr wrapped-body)))
 
-      (when arguments-option
-       (setq wrapped-body (deal-with-arguments-option wrapped-body
-                                                      arguments-option)))
+      (when args-option
+       (setq wrapped-body (deal-with-args-option wrapped-body args-option)))
 
       (when ll
        (setq wrapped-body
@@ -365,16 +364,16 @@
 ;;;
 ;;; At compute-effective-method time, the symbols in the :arguments
 ;;; option are bound to the symbols in the intercept lambda list.
-(defun deal-with-arguments-option (wrapped-body arguments-option)
+(defun deal-with-args-option (wrapped-body args-option)
   (let* ((intercept-lambda-list
           (let (collect)
-            (dolist (arg arguments-option)
+            (dolist (arg args-option)
               (if (memq arg lambda-list-keywords)
                   (push arg collect)
                   (push (gensym) collect)))
              (nreverse collect)))
         (intercept-rebindings
-           (loop for arg in arguments-option
+           (loop for arg in args-option
                  for int in intercept-lambda-list
                  unless (memq arg lambda-list-keywords)
                  collect `(,arg ',int))))