The branch "master" has been updated in SBCL:
via 43a526583b7015e6b9945d16e31da72fda1325f5 (commit)
from 516fe4b0f2272e154575e8024b0b12cbf27c827c (commit)
- Log -----------------------------------------------------------------
commit 43a526583b7015e6b9945d16e31da72fda1325f5
Author: Christophe Rhodes <csr21@...>
Date: Thu Sep 8 17:22:53 2011 +0100
cleanup DESCRIBE of symbols naming type specifiers a bit
Firstly, don't indent the "... names a type specifier". But then
wander around in confusion for a while trying to debug where the extra
indentation comes from, before working out that the pprint-newline at
the end of describe-class introduces indentation as well as a newline,
causing the subsequent logical block to be opened at an unexpected
horizontal position. Fix fix fix.
---
src/code/describe.lisp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/code/describe.lisp b/src/code/describe.lisp
index 4f36a91..8c7802f 100644
--- a/src/code/describe.lisp
+++ b/src/code/describe.lisp
@@ -249,7 +249,7 @@
(:alien "an alien variable"))))
(when (or (not (eq :unknown kind)) (boundp symbol))
(pprint-logical-block (stream nil)
- (format stream "~%~A names ~A:" symbol wot)
+ (format stream "~@:_~A names ~A:" symbol wot)
(pprint-indent :block 2 stream)
(when (eq (info :variable :where-from symbol) :declared)
(format stream "~@:_Declared type: ~S"
@@ -296,10 +296,10 @@
(when fun
(pprint-newline :mandatory stream)
(pprint-logical-block (stream nil)
- (pprint-indent :block 2 stream)
- (format stream "~A names a ~@[primitive~* ~]type-specifier:"
+ (format stream "~@:_~A names a ~@[primitive~* ~]type-specifier:"
symbol
(eq kind :primitive))
+ (pprint-indent :block 2 stream)
(describe-documentation symbol 'type stream (eq t fun))
(unless (eq t fun)
(describe-lambda-list (if (eq :primitive kind)
@@ -382,7 +382,7 @@
(let ((metaclass-name (class-name (class-of class))))
(pprint-logical-block (stream nil)
(when by-name
- (format stream "~%~A names the ~(~A~) ~S:"
+ (format stream "~@:_~A names the ~(~A~) ~S:"
name
metaclass-name
class)
@@ -441,6 +441,7 @@
(quiet-doc slotd t)))
slots))
(format stream "~@:_No direct slots."))))
+ (pprint-indent :block 0 stream)
(pprint-newline :mandatory stream))))))
(defun describe-instance (object stream)
-----------------------------------------------------------------------
hooks/post-receive
--
SBCL
|