X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-type.lisp;h=bb5e8ead6b335b194eeae8ef287a5f568e4abeb7;hb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;hp=9d357d2dfa35e6adb8459aaa304fff593443b063;hpb=93c941d86b264637de20aa1b713757b704d4c1a6;p=sbcl.git diff --git a/src/code/early-type.lisp b/src/code/early-type.lisp index 9d357d2..bb5e8ea 100644 --- a/src/code/early-type.lisp +++ b/src/code/early-type.lisp @@ -344,16 +344,17 @@ ((and (not (eq spec u)) (info :type :builtin spec))) ((eq (info :type :kind spec) :instance) - (sb!xc:find-class spec)) - ((typep spec 'class) + (find-classoid spec)) + ((typep spec 'classoid) ;; There doesn't seem to be any way to translate ;; (TYPEP SPEC 'BUILT-IN-CLASS) into something which can be ;; executed on the host Common Lisp at cross-compilation time. #+sb-xc-host (error "stub: (TYPEP SPEC 'BUILT-IN-CLASS) on xc host") - (if (typep spec 'built-in-class) - (or (built-in-class-translation spec) spec) + (if (typep spec 'built-in-classoid) + (or (built-in-classoid-translation spec) spec) spec)) + ;; FIXME: CL:CLASS objects are type specifiers. (t (let* (;; FIXME: This automatic promotion of FOO-style ;; specs to (FOO)-style specs violates the ANSI