X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpcl%2Fdefcombin.lisp;h=7652ec877e3ff5fcf0bdfd920fbbfe0be9f0cae9;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=ff9265720fa332b0711a02f27a390d45456b6024;hpb=2bcdd03aba3bc43e34732e8c6b0b1bfbead6dae1;p=sbcl.git

diff --git a/src/pcl/defcombin.lisp b/src/pcl/defcombin.lisp
index ff92657..7652ec8 100644
--- a/src/pcl/defcombin.lisp
+++ b/src/pcl/defcombin.lisp
@@ -161,8 +161,33 @@
 		`(,operator ,@(mapcar (lambda (m) `(call-method ,m ()))
 				      primary)))))
       (cond ((null primary)
-	     `(error "No ~S methods for the generic function ~S."
-		     ',type ',generic-function))
+	     ;; As of sbcl-0.8.0.80 we don't seem to need to need
+	     ;; to do anything messy like
+	     ;;        `(APPLY (FUNCTION (IF AROUND
+	     ;;                              'NO-PRIMARY-METHOD
+	     ;;                              'NO-APPLICABLE-METHOD)
+	     ;;                           ',GENERIC-FUNCTION
+	     ;;                           .ARGS.)
+	     ;; here because (for reasons I don't understand at the
+	     ;; moment -- WHN) control will never reach here if there
+	     ;; are no applicable methods, but instead end up
+	     ;; in NO-APPLICABLE-METHODS first.
+	     ;;
+	     ;; FIXME: The way that we arrange for .ARGS. to be bound 
+	     ;; here seems weird. We rely on EXPAND-EFFECTIVE-METHOD-FUNCTION
+	     ;; recognizing any form whose operator is %NO-PRIMARY-METHOD
+	     ;; as magical, and carefully surrounding it with a
+	     ;; LAMBDA form which binds .ARGS. But...
+	     ;;   1. That seems fragile, because the magicalness of
+	     ;;      %NO-PRIMARY-METHOD forms is scattered around
+	     ;;      the system. So it could easily be broken by
+	     ;;      locally-plausible maintenance changes like,
+	     ;;      e.g., using the APPLY expression above.
+	     ;;   2. That seems buggy w.r.t. to MOPpish tricks in
+	     ;;      user code, e.g.
+	     ;;         (DEFMETHOD COMPUTE-EFFECTIVE-METHOD :AROUND (...)
+	     ;;           `(PROGN ,(CALL-NEXT-METHOD) (INCF *MY-CTR*)))
+             `(%no-primary-method ',generic-function .args.))
 	    ((null around) main-method)
 	    (t
 	     `(call-method ,(car around)