projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.42.7: fix shell scripts on Solaris (and FreeBSD?)
[sbcl.git]
/
src
/
pcl
/
combin.lisp
diff --git
a/src/pcl/combin.lisp
b/src/pcl/combin.lisp
index
2f6a222
..
be7a9a8
100644
(file)
--- a/
src/pcl/combin.lisp
+++ b/
src/pcl/combin.lisp
@@
-236,7
+236,7
@@
(declare (ignore .pv. .next-method-call.))
(declare (ignorable .args.))
(flet ((%no-primary-method (gf args)
(declare (ignore .pv. .next-method-call.))
(declare (ignorable .args.))
(flet ((%no-primary-method (gf args)
- (apply #'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))
(%invalid-qualifiers (gf combin method)
(invalid-qualifiers gf combin method)))
(declare (ignorable #'%no-primary-method #'%invalid-qualifiers))
@@
-406,16
+406,10
@@
(defun gf-requires-emf-keyword-checks (generic-function)
(member '&key (gf-lambda-list generic-function)))
(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))
(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)
(dolist (m applicable-methods)
(let ((qualifiers (if (listp m)
(early-method-qualifiers m)