0.9.9.24:

[sbcl.git] / src / pcl / documentation.lisp

diff --git a/src/pcl/documentation.lisp b/src/pcl/documentation.lisp
index b728992..08ef197 100644 (file)
--- a/src/pcl/documentation.lisp
+++ b/src/pcl/documentation.lisp
@@ -45,8 +45,8 @@
   (if (typep x 'generic-function)
       (setf (slot-value x 'documentation) new-value)
       (let ((name (%fun-name x)))
-       (when (and name (typep name '(or symbol cons)))
-         (setf (info :function :documentation name) new-value))))
+        (when (and name (typep name '(or symbol cons)))
+          (setf (info :function :documentation name) new-value))))
   new-value)
 
 (defmethod (setf documentation)
@@ -54,8 +54,8 @@
   (if (typep x 'generic-function)
       (setf (slot-value x 'documentation) new-value)
       (let ((name (%fun-name x)))
-       (when (and name (typep name '(or symbol cons)))
-         (setf (info :function :documentation name) new-value))))
+        (when (and name (typep name '(or symbol cons)))
+          (setf (info :function :documentation name) new-value))))
   new-value)
 
 (defmethod (setf documentation) (new-value (x list) (doc-type (eql 'function)))
@@ -66,8 +66,8 @@
   (setf (random-documentation x 'compiler-macro) new-value))
 
 (defmethod (setf documentation) (new-value
-                                (x symbol)
-                                (doc-type (eql 'function)))
+                                 (x symbol)
+                                 (doc-type (eql 'function)))
   (setf (info :function :documentation x) new-value))
 
 (defmethod (setf documentation)
@@ -101,12 +101,12 @@
   (setf (random-documentation x 'method-combination) new-value))
 \f
 ;;; methods
-(defmethod documentation ((method standard-method) (doc-type (eql 't)))
-  (slot-value slotd 'documentation))
+(defmethod documentation ((x standard-method) (doc-type (eql 't)))
+  (slot-value x 'documentation))
 
 (defmethod (setf documentation)
-    (new-value (method standard-method) (doc-type (eql 't)))
-  (setf (slot-value method 'documentation) new-value))
+    (new-value (x standard-method) (doc-type (eql 't)))
+  (setf (slot-value x 'documentation) new-value))
 \f
 ;;; packages
 
@@ -140,62 +140,70 @@
 (defmethod documentation ((x symbol) (doc-type (eql 'type)))
   (or (values (info :type :documentation x))
       (let ((class (find-class x nil)))
-       (when class
-         (slot-value class 'documentation)))))
+        (when class
+          (slot-value class 'documentation)))))
 
 (defmethod documentation ((x symbol) (doc-type (eql 'structure)))
-  (when (eq (info :type :kind x) :instance)
-    (values (info :type :documentation x))))
+  (cond ((eq (info :type :kind x) :instance)
+         (values (info :type :documentation x)))
+        ((info :typed-structure :info x)
+         (values (info :typed-structure :documentation x)))
+        (t
+         nil)))
 
 (defmethod (setf documentation) (new-value
-                                (x structure-class)
-                                (doc-type (eql 't)))
+                                 (x structure-class)
+                                 (doc-type (eql 't)))
   (setf (info :type :documentation (class-name x)) new-value))
 
 (defmethod (setf documentation) (new-value
-                                (x structure-class)
-                                (doc-type (eql 'type)))
+                                 (x structure-class)
+                                 (doc-type (eql 'type)))
   (setf (info :type :documentation (class-name x)) new-value))
 
 (defmethod (setf documentation) (new-value
-                                (x standard-class)
-                                (doc-type (eql 't)))
+                                 (x standard-class)
+                                 (doc-type (eql 't)))
   (setf (slot-value x 'documentation) new-value))
 
 (defmethod (setf documentation) (new-value
-                                (x standard-class)
-                                (doc-type (eql 'type)))
+                                 (x standard-class)
+                                 (doc-type (eql 'type)))
   (setf (slot-value x 'documentation) new-value))
 
 (defmethod (setf documentation) (new-value (x symbol) (doc-type (eql 'type)))
   (if (or (structure-type-p x) (condition-type-p x))
       (setf (info :type :documentation x) new-value)
       (let ((class (find-class x nil)))
-       (if class
-           (setf (slot-value class 'documentation) new-value)
-           (setf (info :type :documentation x) new-value)))))
+        (if class
+            (setf (slot-value class 'documentation) new-value)
+            (setf (info :type :documentation x) new-value)))))
 
 (defmethod (setf documentation) (new-value
-                                (x symbol)
-                                (doc-type (eql 'structure)))
-  (unless (eq (info :type :kind x) :instance)
-    (error "~S is not the name of a structure type." x))
-  (setf (info :type :documentation x) new-value))
+                                 (x symbol)
+                                 (doc-type (eql 'structure)))
+  (cond ((eq (info :type :kind x) :instance)
+         (setf (info :type :documentation x) new-value))
+        ((info :typed-structure :info x)
+         (setf (info :typed-structure :documentation x) new-value))
+        (t
+         nil)))
+
 \f
 ;;; variables
 (defmethod documentation ((x symbol) (doc-type (eql 'variable)))
   (values (info :variable :documentation x)))
 
 (defmethod (setf documentation) (new-value
-                                (x symbol)
-                                (doc-type (eql 'variable)))
+                                 (x symbol)
+                                 (doc-type (eql 'variable)))
   (setf (info :variable :documentation x) new-value))
 \f
 ;;; default if DOC-TYPE doesn't match one of the specified types
 (defmethod documentation (object doc-type)
   (warn "unsupported DOCUMENTATION: type ~S for object ~S"
-       doc-type
-       (type-of object))
+        doc-type
+        (type-of object))
   nil)
 
 ;;; default if DOC-TYPE doesn't match one of the specified types
@@ -204,8 +212,8 @@
   ;; doc types an implementation is permitted to discard docs at any time
   ;; for any reason, this feels to me more like a warning. -- WHN 19991214
   (warn "discarding unsupported DOCUMENTATION of type ~S for object ~S"
-       doc-type
-       (type-of object))
+        doc-type
+        (type-of object))
   new-value)
 
 ;;; extra-standard methods, for getting at slot documentation