projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.7.13.pcl-class.1
[sbcl.git]
/
src
/
pcl
/
macros.lisp
diff --git
a/src/pcl/macros.lisp
b/src/pcl/macros.lisp
index
2add735
..
823994e
100644
(file)
--- a/
src/pcl/macros.lisp
+++ b/
src/pcl/macros.lisp
@@
-75,9
+75,7
@@
\f
;;;; FIND-CLASS
;;;;
\f
;;;; FIND-CLASS
;;;;
-;;;; This is documented in the CLOS specification. FIXME: Except that
-;;;; SBCL deviates from the spec by having CL:FIND-CLASS distinct from
-;;;; PCL:FIND-CLASS, alas.
+;;;; This is documented in the CLOS specification.
(/show "pcl/macros.lisp 119")
(/show "pcl/macros.lisp 119")
@@
-124,8
+122,7
@@
(find-class-cell-predicate cell))
(defun legal-class-name-p (x)
(find-class-cell-predicate cell))
(defun legal-class-name-p (x)
- (and (symbolp x)
- (not (keywordp x))))
+ (symbolp x))
(defun find-class (symbol &optional (errorp t) environment)
(declare (ignore environment))
(defun find-class (symbol &optional (errorp t) environment)
(declare (ignore environment))
@@
-149,9
+146,6
@@
(/show "pcl/macros.lisp 187")
(/show "pcl/macros.lisp 187")
-;;; Note that in SBCL as in CMU CL,
-;;; COMMON-LISP:FIND-CLASS /= SB-PCL:FIND-CLASS.
-;;; (Yes, this is a KLUDGE!)
(define-compiler-macro find-class (&whole form
symbol &optional (errorp t) environment)
(declare (ignore environment))
(define-compiler-macro find-class (&whole form
symbol &optional (errorp t) environment)
(declare (ignore environment))
@@
-166,8
+160,8
@@
(or (find-class-cell-class ,class-cell)
,(if errorp
`(find-class-from-cell ',symbol ,class-cell t)
(or (find-class-cell-class ,class-cell)
,(if errorp
`(find-class-from-cell ',symbol ,class-cell t)
- `(and (sb-kernel:class-cell-class
- ',(sb-kernel:find-class-cell symbol))
+ `(and (sb-kernel:classoid-cell-classoid
+ ',(sb-kernel:find-classoid-cell symbol))
(find-class-from-cell ',symbol ,class-cell nil))))))
form))
(find-class-from-cell ',symbol ,class-cell nil))))))
form))