;;;; 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)
',type ',operator ',identity-with-one-arg ',documentation)))
(defun load-short-defcombin (type operator ioa doc)
- (let* ((truename *load-truename*)
+ (let* ((pathname *load-pathname*)
(specializers
(list (find-class 'generic-function)
(intern-eql-specializer type)
(short-combine-methods
type options operator ioa new-method doc))
args))
- :definition-source `((define-method-combination ,type) ,truename)))
+ :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)
+ type))
(defun short-combine-methods (type options operator ioa method doc)
(cond ((null options) (setq options '(:most-specific-first)))
`(,operator ,@(mapcar (lambda (m) `(call-method ,m ()))
primary)))))
(cond ((null primary)
- `(error "No ~S methods for the generic function ~S."
- ',type ',generic-function))
+ ;; FIXME(?): NO-APPLICABLE-METHOD seems more appropriate
+ ;; here, but
+ ;; (1) discussion with CSR on #lisp reminded me that it's
+ ;; a vexed question whether we can validly call
+ ;; N-A-M when an :AROUND method exists (and the
+ ;; definition of NO-NEXT-METHOD seems to discourage
+ ;; us from calling NO-NEXT-METHOD directly in that
+ ;; case, since it's supposed to be called from a
+ ;; CALL-NEXT-METHOD form), and
+ ;; (2) a call to N-A-M would require &REST FUN-ARGS, and
+ ;; we don't seem to have FUN-ARGS here.
+ ;; I think ideally failures in short method combination
+ ;; would end up either in NO-APPLICABLE-METHOD or
+ ;; NO-NEXT-METHOD, and I expect that's what ANSI
+ ;; generally intended, but it's not clear to me whether
+ ;; the details of what they actually specified let us
+ ;; make that happen. So for now I've just tried to
+ ;; clarify the error message text but left the general
+ ;; logic alone (and raised the question on sbcl-devel).
+ ;; -- WHN 2003-06-16
+ `(error "no ~S methods for ~S on these arguments"
+ ',type
+ ',generic-function))
((null around) main-method)
(t
`(call-method ,(car around)
\f
;;;; 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))
(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)
(declare (ignore nms cm-args))
(apply
(lambda (generic-function type options)
- (declare (ignore generic-function options))
+ (declare (ignore generic-function))
(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-truename*))))
+ ,*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)
+ type))
(defmethod compute-effective-method ((generic-function generic-function)
(combin long-method-combination)
(defun make-long-method-combination-function
(type ll method-group-specifiers args-option gf-var body)
- ;;(declare (values documentation function))
(declare (ignore type))
- (multiple-value-bind (documentation declarations real-body)
- (extract-declarations body)
-
+ (multiple-value-bind (real-body declarations documentation)
+ (parse-body body)
(let ((wrapped-body
(wrap-method-group-specifier-bindings method-group-specifiers
declarations
(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
(push name names)
(push specializer-cache specializer-caches)
(push `((or ,@tests)
- (if (equal ,specializer-cache .specializers.)
- (return-from .long-method-combination-function.
- '(error "More than one method of type ~S ~
+ (if (and (equal ,specializer-cache .specializers.)
+ (not (null .specializers.)))
+ (return-from .long-method-combination-function.
+ '(error "More than one method of type ~S ~
with the same specializers."
- ',name))
- (setq ,specializer-cache .specializers.))
- (push .method. ,name))
- cond-clauses)
+ ',name))
+ (setq ,specializer-cache .specializers.))
+ (push .method. ,name))
+ cond-clauses)
(when required
(push `(when (null ,name)
(return-from .long-method-combination-function.
(dolist (.method. .applicable-methods.)
(let ((.qualifiers. (method-qualifiers .method.))
(.specializers. (method-specializers .method.)))
- (progn .qualifiers. .specializers.)
+ (declare (ignorable .qualifiers. .specializers.))
(cond ,@(nreverse cond-clauses))))
,@(nreverse required-checks)
,@(nreverse order-cleanups)
;;;
;;; 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)))
-
- ;; 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.)))))
+(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 "~@<The value of the :ARGUMENTS option of ~
+ DEFINE-METHOD-COMBINATION is~2I~_~S,~I~_but &WHOLE may ~
+ only appear first in the lambda list.~:>"
+ :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.))))
- `(let ((inner-result. ,wrapped-body))
- `(apply #'(lambda ,',intercept-lambda-list
- ,,(when (memq '.ignore. intercept-lambda-list)
- ''(declare (ignore .ignore.)))
- ,inner-result.)
- .combined-method-args.))))
+;;; 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)))))
projects / sbcl.git / blobdiff