projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.10.7: multiply-used DX LVARS
[sbcl.git]
/
src
/
pcl
/
combin.lisp
diff --git
a/src/pcl/combin.lisp
b/src/pcl/combin.lisp
index
ba3d35a
..
ecd09d5
100644
(file)
--- a/
src/pcl/combin.lisp
+++ b/
src/pcl/combin.lisp
@@
-36,9
+36,9
@@
(let* ((pv-wrappers (when pv-table
(pv-wrappers-from-all-wrappers
pv-table wrappers)))
(let* ((pv-wrappers (when pv-table
(pv-wrappers-from-all-wrappers
pv-table wrappers)))
- (pv-cell (when (and pv-table pv-wrappers)
- (pv-table-lookup pv-table pv-wrappers))))
- (values mf t fmf pv-cell))
+ (pv (when (and pv-table pv-wrappers)
+ (pv-table-lookup pv-table pv-wrappers))))
+ (values mf t fmf pv))
(values
(or mf (if (listp method)
(bug "early method with no method-function")
(values
(or mf (if (listp method)
(bug "early method with no method-function")
@@
-120,7
+120,7
@@
(defun make-emf-from-method
(method cm-args &optional gf fmf-p method-alist wrappers)
(defun make-emf-from-method
(method cm-args &optional gf fmf-p method-alist wrappers)
- (multiple-value-bind (mf real-mf-p fmf pv-cell)
+ (multiple-value-bind (mf real-mf-p fmf pv)
(get-method-function method method-alist wrappers)
(if fmf
(let* ((next-methods (car cm-args))
(get-method-function method method-alist wrappers)
(if fmf
(let* ((next-methods (car cm-args))
@@
-132,10
+132,10
@@
(default (cons nil nil))
(value (method-plist-value method :constant-value default)))
(if (eq value default)
(default (cons nil nil))
(value (method-plist-value method :constant-value default)))
(if (eq value default)
- (make-fast-method-call :function fmf :pv-cell pv-cell
+ (make-fast-method-call :function fmf :pv pv
:next-method-call next :arg-info arg-info)
(make-constant-fast-method-call
:next-method-call next :arg-info arg-info)
(make-constant-fast-method-call
- :function fmf :pv-cell pv-cell :next-method-call next
+ :function fmf :pv pv :next-method-call next
:arg-info arg-info :value value)))
(if real-mf-p
(flet ((frob-cm-arg (arg)
:arg-info arg-info :value value)))
(if real-mf-p
(flet ((frob-cm-arg (arg)
@@
-216,10
+216,9
@@
(defun expand-effective-method-function (gf effective-method &optional env)
(declare (ignore env))
(defun expand-effective-method-function (gf effective-method &optional env)
(declare (ignore env))
- (multiple-value-bind (nreq applyp metatypes nkeys arg-info)
+ (multiple-value-bind (nreq applyp)
(get-generic-fun-info gf)
(get-generic-fun-info gf)
- (declare (ignore nreq nkeys arg-info))
- (let ((ll (make-fast-method-call-lambda-list metatypes applyp))
+ (let ((ll (make-fast-method-call-lambda-list nreq applyp))
(check-applicable-keywords
(when (and applyp (gf-requires-emf-keyword-checks gf))
'((check-applicable-keywords))))
(check-applicable-keywords
(when (and applyp (gf-requires-emf-keyword-checks gf))
'((check-applicable-keywords))))
@@
-233,8
+232,8
@@
(long-method-combination-args-lambda-list combin))))))
(cond
(error-p
(long-method-combination-args-lambda-list combin))))))
(cond
(error-p
- `(lambda (.pv-cell. .next-method-call. &rest .args.)
- (declare (ignore .pv-cell. .next-method-call.))
+ `(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))
(declare (ignorable .args.))
(flet ((%no-primary-method (gf args)
(apply #'no-primary-method gf args))
@@
-243,27
+242,23
@@
(declare (ignorable #'%no-primary-method #'%invalid-qualifiers))
,effective-method)))
(mc-args-p
(declare (ignorable #'%no-primary-method #'%invalid-qualifiers))
,effective-method)))
(mc-args-p
- (let* ((required
- ;; FIXME: Ick. Shared idiom, too, with stuff in cache.lisp
- (let (req)
- (dotimes (i (length metatypes) (nreverse req))
- (push (dfun-arg-symbol i) req))))
+ (let* ((required (make-dfun-required-args nreq))
(gf-args (if applyp
`(list* ,@required
(sb-c::%listify-rest-args
.dfun-more-context.
(gf-args (if applyp
`(list* ,@required
(sb-c::%listify-rest-args
.dfun-more-context.
- (the (and (unsigned-byte fixnum))
+ (the (and unsigned-byte fixnum)
.dfun-more-count.)))
`(list ,@required))))
`(lambda ,ll
.dfun-more-count.)))
`(list ,@required))))
`(lambda ,ll
- (declare (ignore .pv-cell. .next-method-call.))
+ (declare (ignore .pv. .next-method-call.))
(let ((.gf-args. ,gf-args))
(declare (ignorable .gf-args.))
,@check-applicable-keywords
,effective-method))))
(t
`(lambda ,ll
(let ((.gf-args. ,gf-args))
(declare (ignorable .gf-args.))
,@check-applicable-keywords
,effective-method))))
(t
`(lambda ,ll
- (declare (ignore ,@(if error-p ll '(.pv-cell. .next-method-call.))))
+ (declare (ignore ,@(if error-p ll '(.pv. .next-method-call.))))
,@check-applicable-keywords
,effective-method))))))
,@check-applicable-keywords
,effective-method))))))
@@
-314,7
+309,7
@@
(call-method
(let ((gensym (get-effective-method-gensym)))
(values (make-emf-call
(call-method
(let ((gensym (get-effective-method-gensym)))
(values (make-emf-call
- metatypes applyp gensym
+ (length metatypes) applyp gensym
(make-effective-method-fun-type
generic-function form method-alist-p wrappers-p))
(list gensym))))
(make-effective-method-fun-type
generic-function form method-alist-p wrappers-p))
(list gensym))))
@@
-323,7
+318,7
@@
(type (make-effective-method-list-fun-type
generic-function form method-alist-p wrappers-p)))
(values `(dolist (emf ,gensym nil)
(type (make-effective-method-list-fun-type
generic-function form method-alist-p wrappers-p)))
(values `(dolist (emf ,gensym nil)
- ,(make-emf-call metatypes applyp 'emf type))
+ ,(make-emf-call (length metatypes) applyp 'emf type))
(list gensym))))
(check-applicable-keywords
(values `(check-applicable-keywords .keyargs-start.
(list gensym))))
(check-applicable-keywords
(values `(check-applicable-keywords .keyargs-start.