common-lisp/sbcl.sbcl
1
0
Fork 0
mirror of git://git.code.sf.net/p/sbcl/sbcl synced 2026-09-10 07:26:40 -04:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Don't rely on probably-bogus BOA environment handling

Browse source 
The slot-initforms for slots are specified to be evaluated in the
lexical environment of the defstruct form, not the environment
augmented by the BOA lambda list.  Alter the definition of
PRETTY-STREAM to be unambiguously correct.
This commit is contained in:
Christophe Rhodes 2025-01-15 15:48:59 +00:00
parent 86ccee520d
commit 3b426c69ed
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/code/early-pprint.lisp
View file

@ -120,17 +120,21 @@
(cout #'pretty-out)
(sout #'pretty-sout)
(misc #'pretty-misc))
(:constructor make-pretty-stream (target))
(:constructor make-pretty-stream
(target
&aux
(line-length
(or *print-right-margin*
(sb-impl::line-length target)
default-line-length))
(buffer-start-column
(or (sb-impl::charpos target) 0))))
(:copier nil))
;; Where the output is going to finally go.
(target (missing-arg) :type stream :read-only t)
;; Line length we should format to. Cached here so we don't have to keep
;; extracting it from the target stream.
(line-length (or *print-right-margin*
(sb-impl::line-length target)
default-line-length)
:type column
:read-only t)
(line-length (missing-arg) :type column :read-only t)
;; If non-nil, a function to call before performing OUT or SOUT
(char-out-oneshot-hook nil :type (or null function))
;; A simple string holding all the text that has been output but not yet
@ -149,7 +153,7 @@
;; The column the first character in the buffer will appear in. Normally
;; zero, but if we end up with a very long line with no breaks in it we
;; might have to output part of it. Then this will no longer be zero.
(buffer-start-column (or (sb-impl::charpos target) 0) :type column)
(buffer-start-column (missing-arg) :type column)
;; The line number we are currently on. Used for *PRINT-LINES*
;; abbreviations and to tell when sections have been split across
;; multiple lines.