X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fdefcombin.lisp;h=6163057f1dfe62c92bc93a7e06bad7874c85eb93;hb=d71896ded395b8453794f0c2e121af1cd095de8b;hp=97472ca599049e2d8d392ae30f6cf37100350530;hpb=2fe7ca730f378505f86a7553462fa3241185d444;p=sbcl.git diff --git a/src/pcl/defcombin.lisp b/src/pcl/defcombin.lisp index 97472ca..6163057 100644 --- a/src/pcl/defcombin.lisp +++ b/src/pcl/defcombin.lisp @@ -54,12 +54,12 @@ ;;;; and runs the same rule. (defclass short-method-combination (standard-method-combination) - ((operator - :reader short-combination-operator - :initarg :operator) - (identity-with-one-argument - :reader short-combination-identity-with-one-argument - :initarg :identity-with-one-argument)) + ((operator + :reader short-combination-operator + :initarg :operator) + (identity-with-one-argument + :reader short-combination-identity-with-one-argument + :initarg :identity-with-one-argument)) (:predicate-name short-method-combination-p)) (defun expand-short-defcombin (whole) @@ -98,7 +98,9 @@ :definition-source `((define-method-combination ,type) ,pathname))) (when old-method (remove-method #'find-method-combination old-method)) - (add-method #'find-method-combination new-method))) + (add-method #'find-method-combination new-method) + (setf (random-documentation type 'method-combination) doc) + type)) (defun short-combine-methods (type options operator ioa method doc) (cond ((null options) (setq options '(:most-specific-first))) @@ -127,27 +129,20 @@ (order (car (method-combination-options combin))) (around ()) (primary ())) - (dolist (m applicable-methods) - (let ((qualifiers (method-qualifiers m))) - (flet ((lose (method why) - (invalid-method-error - method - "The method ~S ~A.~%~ - The method combination type ~S was defined with the~%~ - short form of DEFINE-METHOD-COMBINATION and so requires~%~ - all methods have either the single qualifier ~S or the~%~ - single qualifier :AROUND." - method why type type))) - (cond ((null qualifiers) - (lose m "has no qualifiers")) - ((cdr qualifiers) - (lose m "has more than one qualifier")) + (flet ((invalid (gf combin m) + (if *in-precompute-effective-methods-p* + (return-from compute-effective-method + `(%invalid-qualifiers ',gf ',combin ',m)) + (invalid-qualifiers gf combin m)))) + (dolist (m applicable-methods) + (let ((qualifiers (method-qualifiers m))) + (cond ((null qualifiers) (invalid generic-function combin m)) + ((cdr qualifiers) (invalid generic-function combin m)) ((eq (car qualifiers) :around) (push m around)) ((eq (car qualifiers) type) (push m primary)) - (t - (lose m "has an illegal qualifier")))))) + (t (invalid generic-function combin m)))))) (setq around (nreverse around)) (ecase order (:most-specific-last) ; nothing to be done, already in correct order @@ -160,19 +155,60 @@ `(,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) (,@(cdr around) (make-method ,main-method)))))))) + +(defmethod invalid-qualifiers ((gf generic-function) + (combin short-method-combination) + method) + (let ((qualifiers (method-qualifiers method)) + (type (method-combination-type combin))) + (let ((why (cond + ((null qualifiers) "has no qualifiers") + ((cdr qualifiers) "has too many qualifiers") + (t (aver (and (neq (car qualifiers) type) + (neq (car qualifiers) :around))) + "has an invalid qualifier")))) + (invalid-method-error + method + "The method ~S on ~S ~A.~%~ + The method combination type ~S was defined with the~%~ + short form of DEFINE-METHOD-COMBINATION and so requires~%~ + all methods have either the single qualifier ~S or the~%~ + single qualifier :AROUND." + method gf why type type)))) ;;;; long method combinations -(defclass long-method-combination (standard-method-combination) - ((function :initarg :function - :reader long-method-combination-function))) - (defun expand-long-defcombin (form) (let ((type (cadr form)) (lambda-list (caddr form)) @@ -188,11 +224,12 @@ (make-long-method-combination-function type lambda-list method-group-specifiers args-option gf-var body) - `(load-long-defcombin ',type ',documentation #',function)))) + `(load-long-defcombin ',type ',documentation #',function + ',args-option)))) (defvar *long-method-combination-functions* (make-hash-table :test 'eq)) -(defun load-long-defcombin (type doc function) +(defun load-long-defcombin (type doc function args-lambda-list) (let* ((specializers (list (find-class 'generic-function) (intern-eql-specializer type) @@ -212,13 +249,16 @@ (make-instance 'long-method-combination :type type :options options + :args-lambda-list args-lambda-list :documentation doc)) args)) :definition-source `((define-method-combination ,type) ,*load-pathname*)))) (setf (gethash type *long-method-combination-functions*) function) (when old-method (remove-method #'find-method-combination old-method)) - (add-method #'find-method-combination new-method))) + (add-method #'find-method-combination new-method) + (setf (random-documentation type 'method-combination) doc) + type)) (defmethod compute-effective-method ((generic-function generic-function) (combin long-method-combination) @@ -233,9 +273,7 @@ (type ll method-group-specifiers args-option gf-var body) (declare (ignore type)) (multiple-value-bind (real-body declarations documentation) - ;; (Note that PARSE-BODY ignores its second arg ENVIRONMENT.) - (parse-body body nil) - + (parse-body body) (let ((wrapped-body (wrap-method-group-specifier-bindings method-group-specifiers declarations @@ -254,7 +292,8 @@ (values documentation `(lambda (.generic-function. .method-combination. .applicable-methods.) - (progn .generic-function. .method-combination. .applicable-methods.) + (declare (ignorable .generic-function. + .method-combination. .applicable-methods.)) (block .long-method-combination-function. ,wrapped-body)))))) ;; parse-method-group-specifiers parse the method-group-specifiers @@ -370,36 +409,106 @@ ;;; ;;; At compute-effective-method time, the symbols in the :arguments ;;; option are bound to the symbols in the intercept lambda list. -(defun deal-with-args-option (wrapped-body args-option) - (let* ((intercept-lambda-list - (let (collect) - (dolist (arg args-option) - (if (memq arg lambda-list-keywords) - (push arg collect) - (push (gensym) collect))) - (nreverse collect))) - (intercept-rebindings - (loop for arg in args-option - for int in intercept-lambda-list - unless (memq arg lambda-list-keywords) - collect `(,arg ',int)))) - (setf (cadr wrapped-body) - (append intercept-rebindings (cadr wrapped-body))) +(defun deal-with-args-option (wrapped-body args-lambda-list) + (let ((intercept-rebindings + (let (rebindings) + (dolist (arg args-lambda-list (nreverse rebindings)) + (unless (member arg lambda-list-keywords) + (push `(,arg ',arg) rebindings))))) + (nreq 0) + (nopt 0) + (whole nil)) + ;; Count the number of required and optional parameters in + ;; ARGS-LAMBDA-LIST into NREQ and NOPT, and set WHOLE to the + ;; name of a &WHOLE parameter, if any. + (when (member '&whole (rest args-lambda-list)) + (error 'simple-program-error + :format-control "~@" + :format-arguments (list args-lambda-list))) + (loop with state = 'required + for arg in args-lambda-list do + (if (memq arg lambda-list-keywords) + (setq state arg) + (case state + (required (incf nreq)) + (&optional (incf nopt)) + (&whole (setq whole arg state 'required))))) + ;; This assumes that the head of WRAPPED-BODY is a let, and it + ;; injects let-bindings of the form (ARG 'SYM) for all variables + ;; of the argument-lambda-list; SYM is a gensym. + (aver (memq (first wrapped-body) '(let let*))) + (setf (second wrapped-body) + (append intercept-rebindings (second wrapped-body))) + ;; Be sure to fill out the args lambda list so that it can be too + ;; short if it wants to. + (unless (or (memq '&rest args-lambda-list) + (memq '&allow-other-keys args-lambda-list)) + (let ((aux (memq '&aux args-lambda-list))) + (setq args-lambda-list + (append (ldiff args-lambda-list aux) + (if (memq '&key args-lambda-list) + '(&allow-other-keys) + '(&rest .ignore.)) + aux)))) + ;; .GENERIC-FUNCTION. is bound to the generic function in the + ;; method combination function, and .GF-ARGS* is bound to the + ;; generic function arguments in effective method functions + ;; created for generic functions having a method combination that + ;; uses :ARGUMENTS. + ;; + ;; The DESTRUCTURING-BIND binds the parameters of the + ;; ARGS-LAMBDA-LIST to actual generic function arguments. Because + ;; ARGS-LAMBDA-LIST may be shorter or longer than the generic + ;; function's lambda list, which is only known at run time, this + ;; destructuring has to be done on a slighly modified list of + ;; actual arguments, from which values might be stripped or added. + ;; + ;; Using one of the variable names in the body inserts a symbol + ;; into the effective method, and running the effective method + ;; produces the value of actual argument that is bound to the + ;; symbol. + `(let ((inner-result. ,wrapped-body) + (gf-lambda-list (generic-function-lambda-list .generic-function.))) + `(destructuring-bind ,',args-lambda-list + (frob-combined-method-args + .gf-args. ',gf-lambda-list + ,',nreq ,',nopt) + ,,(when (memq '.ignore. args-lambda-list) + ''(declare (ignore .ignore.))) + ;; If there is a &WHOLE in the args-lambda-list, let + ;; it result in the actual arguments of the generic-function + ;; not the frobbed list. + ,,(when whole + ``(setq ,',whole .gf-args.)) + ,inner-result.)))) - ;; Be sure to fill out the intercept lambda list so that it can - ;; be too short if it wants to. - (cond ((memq '&rest intercept-lambda-list)) - ((memq '&allow-other-keys intercept-lambda-list)) - ((memq '&key intercept-lambda-list) - (setq intercept-lambda-list - (append intercept-lambda-list '(&allow-other-keys)))) - (t - (setq intercept-lambda-list - (append intercept-lambda-list '(&rest .ignore.))))) +;;; Partition VALUES into three sections: required, optional, and the +;;; rest, according to required, optional, and other parameters in +;;; LAMBDA-LIST. Make the required and optional sections NREQ and +;;; NOPT elements long by discarding values or adding NILs. Value is +;;; the concatenated list of required and optional sections, and what +;;; is left as rest from VALUES. +(defun frob-combined-method-args (values lambda-list nreq nopt) + (loop with section = 'required + for arg in lambda-list + if (memq arg lambda-list-keywords) do + (setq section arg) + (unless (eq section '&optional) + (loop-finish)) + else if (eq section 'required) + count t into nr + and collect (pop values) into required + else if (eq section '&optional) + count t into no + and collect (pop values) into optional + finally + (flet ((frob (list n m) + (cond ((> n m) (butlast list (- n m))) + ((< n m) (nconc list (make-list (- m n)))) + (t list)))) + (return (nconc (frob required nr nreq) + (frob optional no nopt) + values))))) - `(let ((inner-result. ,wrapped-body)) - `(apply #'(lambda ,',intercept-lambda-list - ,,(when (memq '.ignore. intercept-lambda-list) - ''(declare (ignore .ignore.))) - ,inner-result.) - .combined-method-args.))))