(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
(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))
(: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)
;; * NIL, in which case there's nothing to see here, move along.
(when (eq (info :type :kind x) :defined)
(format s "~@:_It names a type specifier."))
- (let ((symbol-named-class (cl:find-class x nil)))
+ (let ((symbol-named-class (find-classoid x nil)))
(when symbol-named-class
(format s "~@:_It names a class ~A." symbol-named-class)
(describe symbol-named-class s))))