0.8.0.8:

[sbcl.git] / src / pcl / compiler-support.lisp

diff --git a/src/pcl/compiler-support.lisp b/src/pcl/compiler-support.lisp
index 1553085..d4e113e 100644 (file)
--- a/src/pcl/compiler-support.lisp
+++ b/src/pcl/compiler-support.lisp
@@ -45,12 +45,34 @@
       ((csubtypep otype std-obj) t)
       ((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))))
        `(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)))))