(defmethod describe-object ((x character) s)
(print-standard-describe-header x s)
- (format s "~%:_Char-code: ~S" (char-code x))
- (format s "~%:_Char-name: ~A~%_" (char-name x)))
+ (format s "~%Char-code: ~S" (char-code x))
+ (format s "~%Char-name: ~A" (char-name x)))
(defmethod describe-object ((x array) s)
(print-standard-describe-header x s)
(sb-alien-internals:unparse-alien-type
(sb-alien::heap-alien-info-type info)))
(format stream "~@:_Address: #x~8,'0X"
- (sap-int (eval (sb-alien::heap-alien-info-sap-form info))))))
+ (sap-int (sb-alien::heap-alien-info-sap info)))))
((eq kind :macro)
(let ((expansion (info :variable :macro-expansion symbol)))
(format stream "~@:_Expansion: ~S" expansion)))
from
(type-specifier (info :function :type name)))))))
;; Defined.
- (multiple-value-bind (fun what lambda-list ftype from inline
- methods)
+ (multiple-value-bind (fun what lambda-list ftype from inline methods)
(cond ((and (not function) (symbolp name) (special-operator-p name))
(let ((fun (symbol-function name)))
(values fun "a special operator" (%fun-lambda-list fun))))
(let ((fun (or function (fdefinition name))))
(multiple-value-bind (ftype from)
(if function
- (values (%fun-type function) "Derived")
+ (values (%fun-type function) :derived)
(let ((ctype (info :function :type name)))
(values (when ctype (type-specifier ctype))
(when ctype
;; from methods.
(sb-c::maybe-update-info-for-gf name)
(ecase (info :function :where-from name)
- (:declared "Declared")
+ (:declared :declared)
;; This is hopefully clearer to users
- ((:defined-method :defined) "Derived"))))))
+ ((:defined-method :defined) :derived))))))
(if (typep fun 'generic-function)
(values fun
"a generic function"
(pprint-indent :block 2 stream))
(describe-lambda-list lambda-list stream)
(when (and ftype from)
- (format stream "~@:_~A type: ~S" from ftype))
+ (format stream "~@:_~:(~A~) type: ~S" from ftype))
+ (when (eq :declared from)
+ (let ((derived-ftype (%fun-type fun)))
+ (unless (equal derived-ftype ftype)
+ (format stream "~@:_Derived type: ~S" derived-ftype))))
(describe-documentation name 'function stream)
(when (car inline)
(format stream "~@:_Inline proclamation: ~A (~:[no ~;~]inline expansion available)"
(car inline)
(cdr inline)))
+ (awhen (info :function :info name)
+ (awhen (sb-c::decode-ir1-attributes (sb-c::fun-info-attributes it))
+ (format stream "~@:_Known attributes: ~(~{~A~^, ~}~)" it)))
(when methods
(format stream "~@:_Method-combination: ~S"
(sb-pcl::method-combination-type-name