X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpprint.lisp;h=d17ccfcafa4488e031c1814a1b5ee5a7a86e5283;hb=224466fab9dc4e8b3faf13a121f827f198811bf6;hp=af346a515c237610e3ce3e60d3f30ae12658a7a3;hpb=80cee3cf18d09202aa30ab957e08c5759e573bbe;p=sbcl.git diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp index af346a5..d17ccfc 100644 --- a/src/code/pprint.lisp +++ b/src/code/pprint.lisp @@ -314,16 +314,17 @@ ;; (In the PPRINT-LOGICAL-BLOCK form which calls us, ;; :PREFIX and :PER-LINE-PREFIX have hairy defaulting behavior, ;; and might end up being NIL.) - (declare (type (or null string prefix))) + (declare (type (or null string) prefix)) ;; (But the defaulting behavior of PPRINT-LOGICAL-BLOCK :SUFFIX is ;; trivial, so it should always be a string.) (declare (type string suffix)) (when prefix + (setq prefix (coerce prefix 'simple-string)) (pretty-sout stream prefix 0 (length prefix))) (let* ((pending-blocks (pretty-stream-pending-blocks stream)) (start (enqueue stream block-start :prefix (and per-line-p prefix) - :suffix suffix + :suffix (coerce suffix 'simple-string) :depth (length pending-blocks)))) (setf (pretty-stream-pending-blocks stream) (cons start pending-blocks)))) @@ -1006,7 +1007,7 @@ (index index) (step (reduce #'* dims)) (count 0)) - (loop + (loop (pprint-pop) (output-guts stream index dims) (when (= (incf count) dim)