X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fwrapper.lisp;h=35ad695178f3693246c3187da8ada868bcdbba74;hb=ee5629ee974ee8ce7a1cb245a99e94f8943ffd90;hp=7abe62881456be2beaf3c2a0afe21c4a7a20e22a;hpb=95f17ca63742f8c164309716b35bc25545a849a6;p=sbcl.git diff --git a/src/pcl/wrapper.lisp b/src/pcl/wrapper.lisp index 7abe628..35ad695 100644 --- a/src/pcl/wrapper.lisp +++ b/src/pcl/wrapper.lisp @@ -153,7 +153,7 @@ (remhash owrapper *previous-nwrappers*) (setf (gethash nwrapper *previous-nwrappers*) new-previous))) -;;; FIXME: This is not a good name: part of the constract here is that +;;; FIXME: This is not a good name: part of the contract here is that ;;; we return the valid wrapper, which is not obvious from the name ;;; (or the names of our callees.) (defun check-wrapper-validity (instance) @@ -236,15 +236,15 @@ ;;; specialize cache implementation or discrimination nets, but this ;;; has not occurred as yet. (defun raise-metatype (metatype new-specializer) - (let ((slot (find-class 'slot-class)) - (standard (find-class 'standard-class)) - (fsc (find-class 'funcallable-standard-class)) - (condition (find-class 'condition-class)) - (structure (find-class 'structure-class)) - (built-in (find-class 'built-in-class)) - (frc (find-class 'forward-referenced-class))) + (let ((slot *the-class-slot-class*) + (standard *the-class-standard-class*) + (fsc *the-class-funcallable-standard-class*) + (condition *the-class-condition-class*) + (structure *the-class-structure-class*) + (built-in *the-class-built-in-class*) + (frc *the-class-forward-referenced-class*)) (flet ((specializer->metatype (x) - (let* ((specializer-class (if (eq *boot-state* 'complete) + (let* ((specializer-class (if (eq **boot-state** 'complete) (specializer-class-or-nil x) x)) (meta-specializer (class-of specializer-class)))