X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fcombin.lisp;h=8128f53478e3b64bd0a6125c465300b0b694542a;hb=HEAD;hp=201620b089dad296681917eb86205d3e32adf10a;hpb=e66288cd5588b336b79a7e19f1c884e4e3263d53;p=sbcl.git diff --git a/src/pcl/combin.lisp b/src/pcl/combin.lisp index 201620b..8128f53 100644 --- a/src/pcl/combin.lisp +++ b/src/pcl/combin.lisp @@ -105,7 +105,7 @@ ;; or aren't to prevent the leaky next methods bug. (let* ((cm-args (cdr form)) (fmf-p (and (null no-fmf-p) - (or (not (eq *boot-state* 'complete)) + (or (not (eq **boot-state** 'complete)) (gf-fast-method-function-p generic-function)) (null (cddr cm-args)))) (method (car cm-args)) @@ -225,22 +225,23 @@ (error-p (or (eq (first effective-method) '%no-primary-method) (eq (first effective-method) '%invalid-qualifiers))) (mc-args-p - (when (eq *boot-state* 'complete) + (when (eq **boot-state** 'complete) ;; Otherwise the METHOD-COMBINATION slot is not bound. (let ((combin (generic-function-method-combination gf))) (and (long-method-combination-p combin) - (long-method-combination-args-lambda-list combin)))))) + (long-method-combination-args-lambda-list combin))))) + (name `(emf ,(generic-function-name gf)))) (cond (error-p - `(lambda (.pv. .next-method-call. &rest .args.) - (declare (ignore .pv. .next-method-call.)) - (declare (ignorable .args.)) - (flet ((%no-primary-method (gf args) - (apply #'no-primary-method gf args)) - (%invalid-qualifiers (gf combin method) - (invalid-qualifiers gf combin method))) - (declare (ignorable #'%no-primary-method #'%invalid-qualifiers)) - ,effective-method))) + `(named-lambda ,name (.pv. .next-method-call. &rest .args.) + (declare (ignore .pv. .next-method-call.)) + (declare (ignorable .args.)) + (flet ((%no-primary-method (gf args) + (call-no-primary-method gf args)) + (%invalid-qualifiers (gf combin method) + (invalid-qualifiers gf combin method))) + (declare (ignorable #'%no-primary-method #'%invalid-qualifiers)) + ,effective-method))) (mc-args-p (let* ((required (make-dfun-required-args nreq)) (gf-args (if applyp @@ -250,17 +251,17 @@ (the (and unsigned-byte fixnum) .dfun-more-count.))) `(list ,@required)))) - `(lambda ,ll - (declare (ignore .pv. .next-method-call.)) - (let ((.gf-args. ,gf-args)) - (declare (ignorable .gf-args.)) - ,@check-applicable-keywords - ,effective-method)))) + `(named-lambda ,name ,ll + (declare (ignore .pv. .next-method-call.)) + (let ((.gf-args. ,gf-args)) + (declare (ignorable .gf-args.)) + ,@check-applicable-keywords + ,effective-method)))) (t - `(lambda ,ll - (declare (ignore ,@(if error-p ll '(.pv. .next-method-call.)))) - ,@check-applicable-keywords - ,effective-method)))))) + `(named-lambda ,name ,ll + (declare (ignore ,@(if error-p ll '(.pv. .next-method-call.)))) + ,@check-applicable-keywords + ,effective-method)))))) (defun expand-emf-call-method (gf form metatypes applyp env) (declare (ignore gf metatypes applyp env)) @@ -406,16 +407,10 @@ (defun gf-requires-emf-keyword-checks (generic-function) (member '&key (gf-lambda-list generic-function))) -(defvar *in-precompute-effective-methods-p* nil) - (defun standard-compute-effective-method (generic-function combin applicable-methods) (collect ((before) (primary) (after) (around)) - (flet ((invalid (gf combin m) - (if *in-precompute-effective-methods-p* - (return-from standard-compute-effective-method - `(%invalid-qualifiers ',gf ',combin ',m)) - (invalid-qualifiers gf combin m)))) + (flet ((invalid (gf combin m) (invalid-qualifiers gf combin m))) (dolist (m applicable-methods) (let ((qualifiers (if (listp m) (early-method-qualifiers m)