projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.16.37: fix bug #206 -- SB-FLUID build works once more
[sbcl.git]
/
src
/
code
/
typep.lisp
diff --git
a/src/code/typep.lisp
b/src/code/typep.lisp
index
36e776a
..
bcc2934
100644
(file)
--- a/
src/code/typep.lisp
+++ b/
src/code/typep.lisp
@@
-39,6
+39,7
@@
((* t) t)
((instance) (%instancep object))
((funcallable-instance) (funcallable-instance-p object))
((* t) t)
((instance) (%instancep object))
((funcallable-instance) (funcallable-instance-p object))
+ ((extended-sequence) (extended-sequence-p object))
((nil) nil)))
(numeric-type
(and (numberp object)
((nil) nil)))
(numeric-type
(and (numberp object)
@@
-104,7
+105,8
@@
(specifier-type (array-element-type
object)))))))
(member-type
(specifier-type (array-element-type
object)))))))
(member-type
- (if (member object (member-type-members type)) t))
+ (when (member-type-member-p object type)
+ t))
(classoid
#+sb-xc-host (ctypep object type)
#-sb-xc-host (classoid-typep (layout-of object) type object))
(classoid
#+sb-xc-host (ctypep object type)
#-sb-xc-host (classoid-typep (layout-of object) type object))
@@
-185,11
+187,7
@@
(values obj-layout layout))
(aver (< i 2))
(when (layout-invalid obj-layout)
(values obj-layout layout))
(aver (< i 2))
(when (layout-invalid obj-layout)
- (if (typep (classoid-of object) 'standard-classoid)
- (setq obj-layout (sb!pcl::check-wrapper-validity object))
- (error "~S was called on an obsolete object (classoid ~S)."
- 'typep
- (classoid-proper-name (layout-classoid obj-layout)))))
+ (setq obj-layout (update-object-layout-or-invalid object layout)))
(ensure-classoid-valid classoid layout))
(let ((obj-inherits (layout-inherits obj-layout)))
(or (eq obj-layout layout)
(ensure-classoid-valid classoid layout))
(let ((obj-inherits (layout-inherits obj-layout)))
(or (eq obj-layout layout)