Changeset 5405

Timestamp:

Oct 23, 2006, 4:26:33 AM (18 years ago)

Author:

Gary Byers

Message:

WITH-OUTPUT-TO-STRING: don't expand into code which evaluates the string form
twice; don't do whatever was being done to default the element type of the
string stream.

File:

• trunk/ccl/lib/macros.lisp (modified) (1 diff)

trunk/ccl/lib/macros.lisp

@@ -1377 +1377 @@
 executed as an implicit progn with VAR bound to an output string stream.
 All output to that string stream is saved in a string."
-  (let ((e-type (gensym "e-type")))
+  (let ((string-var (gensym "string")))
     (multiple-value-bind (forms decls) (parse-body body env nil)
-      `(let* ((,e-type ,(if element-type-p element-type `'base-char))
-              (,var (if ,string
+      `(let* ((,string-var ,string)
+              (,var (if ,string-var
                         (%make-string-output-stream ,string)
-                        (make-string-output-stream :element-type ,e-type))))
+                      ,@(if element-type-p
+                            `((make-string-output-stream :element-type ',element-type))
+                            `((make-string-output-stream))))))
          ,@decls
          (unwind-protect