X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Fcompiler-support.lisp;h=cbc6f9cd66d3283d1e59b1bcbbc7717fce3eb8b1;hb=22aec7852f4861e5dab28cc0d619c24b62590dad;hp=2cfa67dcf16252d09782d635532613b6dcbcedff;hpb=d5aafdd8ab6387e12bac187048ed322bc96fb79a;p=sbcl.git

diff --git a/src/pcl/compiler-support.lisp b/src/pcl/compiler-support.lisp
index 2cfa67d..cbc6f9c 100644
--- a/src/pcl/compiler-support.lisp
+++ b/src/pcl/compiler-support.lisp
@@ -43,14 +43,38 @@
     (cond
       ;; Flush tests whose result is known at compile time.
       ((csubtypep otype std-obj) t)
-      ((not (types-intersect otype std-obj)) nil)
+      ((not (types-equal-or-intersect otype std-obj)) nil)
       (t
-       `(typep (sb-kernel:layout-of object) 'sb-pcl::wrapper)))))
+       `(typep (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)
-	   ,(nth-value 2 (sb-pcl::parse-specialized-lambda-list
-			  (elt stuff arg-pos))))
+	   ,(handler-case
+	        (nth-value 2 (sb-pcl::parse-specialized-lambda-list
+			      (elt stuff arg-pos)))
+	      (error () "<illegal syntax>")))
 	`(defmethod ,name "<illegal syntax>"))))
+
+(defvar sb-pcl::*internal-pcl-generalized-fun-name-symbols* nil)
+
+(defmacro define-internal-pcl-function-name-syntax (name &rest rest)
+  `(progn
+     (define-function-name-syntax ,name ,@rest)
+     (pushnew ',name sb-pcl::*internal-pcl-generalized-fun-name-symbols*)))
+
+(define-internal-pcl-function-name-syntax sb-pcl::class-predicate (list)
+  (when (cdr list)
+    (destructuring-bind (name &rest rest) (cdr list)
+      (when (and (symbolp name)
+		 (null rest))
+	(values t name)))))
+
+(define-internal-pcl-function-name-syntax sb-pcl::slot-accessor (list)
+  (when (= (length list) 4)
+    (destructuring-bind (class slot rwb) (cdr list)
+      (when (and (member rwb '(sb-pcl::reader sb-pcl::writer sb-pcl::boundp))
+		 (symbolp slot)
+		 (symbolp class))
+	(values t slot)))))