diff --git a/pcl/dfun.lisp b/pcl/dfun.lisp index 19dc45ab5b66545fa0cfe4478af822db7281c411..33097e7c35e5e485560e9f7efd46f3144413365b 100644 --- a/pcl/dfun.lisp +++ b/pcl/dfun.lisp @@ -25,7 +25,7 @@ ;;; ************************************************************************* (file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/dfun.lisp,v 1.36 2005/01/27 14:45:58 rtoy Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/dfun.lisp,v 1.37 2005/06/15 17:30:59 rtoy Exp $") (in-package :pcl) @@ -1613,7 +1613,7 @@ And so, we are saved. (case (car ntype) (class (let* ((class (type-class specl)) - (cpl (cpl-maybe-early class))) + (cpl (cpl-or-nil class))) (not (memq (cadr ntype) cpl)))) (class-eq (let ((class (case (car specl) @@ -1626,7 +1626,7 @@ And so, we are saved. (class-eq (cadr specl)) (prototype (cadr specl)) (class (cadr specl)))) - (cpl (cpl-maybe-early class))) + (cpl (cpl-or-nil class))) (not (memq (cadr ntype) cpl)))) (eql (case (car specl) @@ -1640,7 +1640,7 @@ And so, we are saved. (if (eq 'class (car specl)) (let* ((specl (cadr specl)) (type (cadr type)) - (cpl (cpl-maybe-early type)) + (cpl (cpl-or-nil type)) (pred (memq specl cpl))) (values pred (or pred @@ -1651,7 +1651,7 @@ And so, we are saved. (classes-have-common-subclass-p specl type))))) (values nil (let* ((class (type-class specl)) - (cpl (cpl-maybe-early class))) + (cpl (cpl-or-nil class))) (memq (cadr type) cpl))))) (defun classes-have-common-subclass-p (class1 class2) @@ -1671,7 +1671,7 @@ And so, we are saved. (class (or (eq (cadr specl) (cadr type)) (memq (cadr specl) - (cpl-maybe-early (cadr type)))))))) + (cpl-or-nil (cadr type)))))))) (values pred pred)))) (defun saut-prototype (specl type) @@ -1686,7 +1686,7 @@ And so, we are saved. (eq (cadr specl) (class-of (cadr type)))) (class (memq (cadr specl) - (cpl-maybe-early (class-of (cadr type)))))))) + (cpl-or-nil (class-of (cadr type)))))))) (values pred pred)))