From ba34717602d80e5fd74d10e61f4729fb0d019a0c Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Mon, 9 Aug 2004 23:04:17 +0000 Subject: [PATCH] 0.8.13.45: PRINT-UNREADABLE-OBJECT fixes ... OK, do the ugly thing that seems to be specified in ANSI: include spaces even in illogical places. ... also delete the conditional newlines, even though they claimed to have been removed in 0.8.0.80. Weird. --- NEWS | 2 ++ src/code/print.lisp | 9 +++------ version.lisp-expr | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index f6cc23b..0a16ae5 100644 --- a/NEWS +++ b/NEWS @@ -44,6 +44,8 @@ changes in sbcl-0.8.14 relative to sbcl-0.8.13: ** literal spaces directly after ~ directives within a format-logical-block (~:< ~@:>) do not induce :FILL-style conditional newlines. + ** PRINT-UNREADABLE-OBJECT inserts spaces as specified (and only + as specified: it no longer includes conditional newlines). changes in sbcl-0.8.13 relative to sbcl-0.8.12: * new feature: SB-PACKAGE-LOCKS. See the "Package Locks" section of diff --git a/src/code/print.lisp b/src/code/print.lisp index 3556649..ce3e836 100644 --- a/src/code/print.lisp +++ b/src/code/print.lisp @@ -249,15 +249,12 @@ (when type (write (type-of object) :stream stream :circle nil :level nil :length nil) - (when (or body identity) - (write-char #\space stream) - (pprint-newline :fill stream))) + (write-char #\space stream)) (when body (funcall body)) (when identity - (when body - (write-char #\space stream) - (pprint-newline :fill stream)) + (when (or body (not type)) + (write-char #\space stream)) (write-char #\{ stream) (write (get-lisp-obj-address object) :stream stream :radix nil :base 16) diff --git a/version.lisp-expr b/version.lisp-expr index 17732f1..bc19ddc 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.13.44" +"0.8.13.45" -- 1.7.10.4