[Sbcl-commits] CVS: sbcl/tests clos.impure.lisp,1.19,1.20

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/tests
In directory usw-pr-cvs1:/tmp/cvs-serv31733/tests

Modified Files:
	clos.impure.lisp 
Log Message:
0.7.9.18:
	DEFINE-METHOD-COMBINATION should return the name of the method
		combination, not some method.  Make it so.


Index: clos.impure.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/clos.impure.lisp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- clos.impure.lisp	30 Oct 2002 12:25:50 -0000	1.19
+++ clos.impure.lisp	30 Oct 2002 16:20:01 -0000	1.20
@@ -365,6 +365,27 @@
 	   k)
 
 (dmc-test-mc :k 1)
+;;; While I'm at it, DEFINE-METHOD-COMBINATION is defined to return
+;;; the NAME argument, not some random method object. So:
+(assert (eq (define-method-combination dmc-test-return-foo)
+	    'dmc-test-return-foo))
+(assert (eq (define-method-combination dmc-test-return-bar :operator and)
+	    'dmc-test-return-bar))
+(assert (eq (define-method-combination dmc-test-return
+		(&optional (order :most-specific-first))
+	      ((around (:around))
+	       (primary (dmc-test-return) :order order :required t))
+	      (let ((form (if (rest primary)
+			      `(and ,@(mapcar #'(lambda (method)
+						  `(call-method ,method))
+					      primary))
+			      `(call-method ,(first primary)))))
+		(if around
+		    `(call-method ,(first around)
+		      (,@(rest around)
+		       (make-method ,form)))
+		    form)))
+	    'dmc-test-return))
 
 ;;;; success