X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fdefcombin.lisp;h=f91b20f4929bc84ea7dd535b4d40fdc7da79b596;hb=4dbc52ee4f9a4f566701f1d33e7916e8491b918b;hp=536d1ce89117bddd3e8c59cae5ee77d6958e28c0;hpb=e8b69b1dd5564a4237b1bdc1060820c3b820cde2;p=sbcl.git

diff --git a/src/pcl/defcombin.lisp b/src/pcl/defcombin.lisp
index 536d1ce..f91b20f 100644
--- 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)))
@@ -124,6 +124,7 @@
   (let ((type (method-combination-type combin))
 	(operator (short-combination-operator combin))
 	(ioa (short-combination-identity-with-one-argument combin))
+	(order (car (method-combination-options combin)))
 	(around ())
 	(primary ()))
     (dolist (m applicable-methods)
@@ -147,13 +148,16 @@
 		 (push m primary))
 		(t
 		 (lose m "has an illegal qualifier"))))))
-    (setq around (nreverse around)
-	  primary (nreverse primary))
+    (setq around (nreverse around))
+    (ecase order
+      (:most-specific-last) ; nothing to be done, already in correct order
+      (:most-specific-first
+       (setq primary (nreverse primary))))
     (let ((main-method
 	    (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 +178,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 +204,17 @@
 	     :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))
+			    (make-instance 'long-method-combination
+					   :type type
+					   :options options
+					   :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 +230,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 +243,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 +369,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))))