(defmacro with-pretty-stream ((stream-var
&optional (stream-expression stream-var))
&body body)
- (let ((flet-name (gensym "WITH-PRETTY-STREAM-")))
+ (let ((flet-name (sb!xc:gensym "WITH-PRETTY-STREAM")))
`(flet ((,flet-name (,stream-var)
,@body))
(let ((stream ,stream-expression))
((t) *terminal-io*)
(t ,stream))))))
(let* ((object-var (if object (gensym) nil))
- (block-name (gensym "PPRINT-LOGICAL-BLOCK-"))
+ (block-name (sb!xc:gensym "PPRINT-LOGICAL-BLOCK-"))
(count-name (gensym "PPRINT-LOGICAL-BLOCK-LENGTH-"))
- (pp-pop-name (gensym "PPRINT-POP-"))
+ (pp-pop-name (sb!xc:gensym "PPRINT-POP-"))
(body
;; FIXME: It looks as though PPRINT-LOGICAL-BLOCK might
;; expand into a boatload of code, since DESCEND-INTO is a
(let ((,count-name 0))
(declare (type index ,count-name) (ignorable ,count-name))
,@(when (and (or prefixp per-line-prefix-p)
- (not (and (sb!xc:constantp (or prefix per-line-prefix) env)
- ;; KLUDGE: EVAL-IN-ENV would
- ;; be useful here.
- (typep (eval (or prefix per-line-prefix)) 'string))))
+ (not (sb!int:constant-typep
+ (or prefix per-line-prefix)
+ 'string
+ env)))
`((unless (typep ,(or prefix per-line-prefix) 'string)
(error 'type-error
:datum ,(or prefix per-line-prefix)
:expected-type 'string))))
,@(when (and suffixp
- (not (and (sb!xc:constantp suffix env)
- (typep (eval suffix) 'string))))
+ (not (sb!int:constant-typep suffix 'string env)))
`((unless (typep ,suffix 'string)
(error 'type-error
:datum ,suffix