0.9.1.38:

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

diff --git a/src/pcl/compiler-support.lisp b/src/pcl/compiler-support.lisp
index 1553085..937da71 100644 (file)
--- a/src/pcl/compiler-support.lisp
+++ b/src/pcl/compiler-support.lisp
@@ -38,19 +38,65 @@
   (movable foldable flushable explicit-check))
 
 (deftransform sb-pcl::pcl-instance-p ((object))
-  (let* ((otype (continuation-type object))
+  (let* ((otype (lvar-type object))
         (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-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 &body body)
+  `(progn
+     (define-function-name-syntax ,name ,@body)
+     (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)))))
+
+(define-internal-pcl-function-name-syntax sb-pcl::fast-method (list)
+  (valid-function-name-p (cadr list)))
+
+(define-internal-pcl-function-name-syntax sb-pcl::slow-method (list)
+  (valid-function-name-p (cadr list)))
+
+(define-internal-pcl-function-name-syntax sb-pcl::ctor (list)
+  (valid-function-name-p (cadr list)))
+
+(defun sb-pcl::random-documentation (name type)
+  (cdr (assoc type (info :random-documentation :stuff name))))
+
+(defun sb-pcl::set-random-documentation (name type new-value)
+  (let ((pair (assoc type (info :random-documentation :stuff name))))
+    (if pair
+       (setf (cdr pair) new-value)
+       (push (cons type new-value)
+             (info :random-documentation :stuff name))))
+  new-value)
+
+(defsetf sb-pcl::random-documentation sb-pcl::set-random-documentation)