projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8aplha.0.6:
[sbcl.git]
/
src
/
code
/
pred.lisp
diff --git
a/src/code/pred.lisp
b/src/code/pred.lisp
index
400c42b
..
78a51c2
100644
(file)
--- a/
src/code/pred.lisp
+++ b/
src/code/pred.lisp
@@
-115,8
+115,8
@@
"Return the type of OBJECT."
(if (typep object '(or function array complex))
(type-specifier (ctype-of object))
"Return the type of OBJECT."
(if (typep object '(or function array complex))
(type-specifier (ctype-of object))
- (let* ((class (layout-class (layout-of object)))
- (name (class-name class)))
+ (let* ((classoid (layout-classoid (layout-of object)))
+ (name (classoid-name classoid)))
(if (typep object 'instance)
(case name
(sb!alien-internals:alien-value
(if (typep object 'instance)
(case name
(sb!alien-internals:alien-value
@@
-124,7
+124,7
@@
,(sb!alien-internals:unparse-alien-type
(sb!alien-internals:alien-value-type object))))
(t
,(sb!alien-internals:unparse-alien-type
(sb!alien-internals:alien-value-type object))))
(t
- (class-proper-name class)))
+ (classoid-proper-name classoid)))
name))))
\f
;;;; equality predicates
name))))
\f
;;;; equality predicates
@@
-209,7
+209,7
@@
(len (layout-length layout-x)))
(and (typep y 'instance)
(eq layout-x (%instance-layout y))
(len (layout-length layout-x)))
(and (typep y 'instance)
(eq layout-x (%instance-layout y))
- (structure-class-p (layout-class layout-x))
+ (structure-classoid-p (layout-classoid layout-x))
(do ((i 1 (1+ i)))
((= i len) t)
(declare (fixnum i))
(do ((i 1 (1+ i)))
((= i len) t)
(declare (fixnum i))