0.7.12.47:

[sbcl.git] / src / code / describe.lisp

diff --git a/src/code/describe.lisp b/src/code/describe.lisp
index 7ea642d..45b451e 100644 (file)
--- a/src/code/describe.lisp
+++ b/src/code/describe.lisp
@@ -13,14 +13,14 @@
 (in-package "SB-IMPL") ;(SB-IMPL, not SB!IMPL, since we're built in warm load.)
 \f
 (declaim (ftype (function (t stream)) describe-object))
-(defgeneric describe-object ((x t) stream))
+(defgeneric describe-object (x stream))
 
 (defun describe (x &optional (stream-designator *standard-output*))
   #+sb-doc
   "Print a description of the object X."
   (let ((stream (out-synonym-of stream-designator)))
+    (fresh-line stream)
     (pprint-logical-block (stream nil)
-      (pprint-newline :mandatory stream)
       (describe-object x stream)
       (pprint-newline :mandatory stream)))
   (values))
@@ -43,18 +43,18 @@
 
 (defmethod describe-object ((x array) s)
   (let ((rank (array-rank x)))
-    (cond ((> rank 1)
-          (format s "~S ~_is " x)
-          (write-string (if (%array-displaced-p x) "a displaced" "an") s)
-          (format s " array of rank ~S." rank)
-          (format s "~@:_Its dimensions are ~S." (array-dimensions x)))
-         (t
+    (cond ((= rank 1)
           (format s
                   "~@:_~S is a ~:[~;displaced ~]vector of length ~S." x
                   (and (array-header-p x) (%array-displaced-p x)) (length x))
           (when (array-has-fill-pointer-p x)
             (format s "~@:_It has a fill pointer, currently ~S."
-                    (fill-pointer x))))))
+                    (fill-pointer x))))
+         (t
+          (format s "~S ~_is " x)
+          (write-string (if (%array-displaced-p x) "a displaced" "an") s)
+          (format s " array of rank ~S." rank)
+          (format s "~@:_Its dimensions are ~S." (array-dimensions x)))))
   (let ((array-element-type (array-element-type x)))
     (unless (eq array-element-type t)
       (format s
@@ -110,7 +110,7 @@
 (defun %describe-fun-name (name s type-spec) 
   (when (and name (typep name '(or symbol cons)))
     (multiple-value-bind (type where)
-       (if (or (symbolp name) (and (listp name) (eq (car name) 'setf)))
+       (if (legal-fun-name-p name)
            (values (type-specifier (info :function :type name))
                    (info :function :where-from name))
            (values type-spec :defined))
@@ -185,7 +185,7 @@
     (:function (if name
                   (format s "Function: ~S" x)
                   (format s "~S is a function." x))))
-  (format s "~@:_Its associated name (as in ~S) is ~S."
+  (format s "~@:_~@<Its associated name (as in ~S) is ~2I~_~S.~:>"
          'function-lambda-expression
          (%fun-name x))
   (case (widetag-of x)
@@ -209,7 +209,7 @@
 (defmethod describe-object ((x function) s)
   (%describe-fun x s :function))
 
-(defgeneric describe-symbol-fdefinition (function stream &key (name nil) ))
+(defgeneric describe-symbol-fdefinition (function stream &key name))
 
 (defmethod describe-symbol-fdefinition ((fun function) stream &key name)
   (%describe-fun fun stream :function name))