X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fcompiler-support.lisp;h=56fc27112a67c0c277d10ef6c23b05b0ecefdcad;hb=138ba28006d97560d270d8da3cf3c99012e9053d;hp=41951e080d29bbdcb9134876c234b4a39298fe8f;hpb=475c832b081651e66ad9446d4852c62086f5e740;p=sbcl.git diff --git a/src/pcl/compiler-support.lisp b/src/pcl/compiler-support.lisp index 41951e0..56fc271 100644 --- a/src/pcl/compiler-support.lisp +++ b/src/pcl/compiler-support.lisp @@ -42,12 +42,12 @@ (std-obj (specifier-type 'sb-pcl::std-object))) (cond ;; Flush tests whose result is known at compile time. - ((csubtypep otype std-obj) 't) - ((not (types-intersect otype std-obj)) 'nil) + ((csubtypep otype std-obj) t) + ((not (types-equal-or-intersect otype std-obj)) nil) (t `(typep (sb-kernel:layout-of object) 'sb-pcl::wrapper))))) -(def-source-context defmethod (name &rest stuff) +(define-source-context defmethod (name &rest stuff) (let ((arg-pos (position-if #'listp stuff))) (if arg-pos `(defmethod ,name ,@(subseq stuff 0 arg-pos)