X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fpcl%2Fmacros.lisp;h=823994e0deb14085d5932eee6a6a47c4ebd7edd7;hb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;hp=2add735d9fe6e264d79bb1d2924eddecde7bb695;hpb=1e08b23e730c7a1c9cda1b918e9fdca38b8c4e17;p=sbcl.git diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp index 2add735..823994e 100644 --- a/src/pcl/macros.lisp +++ b/src/pcl/macros.lisp @@ -75,9 +75,7 @@ ;;;; 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") @@ -124,8 +122,7 @@ (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)) @@ -149,9 +146,6 @@ (/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)) @@ -166,8 +160,8 @@ (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))