mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 03:30:27 +02:00
Code Activity

Make `(format #f ...)' always Unicode-capable.

Browse source 
* module/ice-9/format.scm (format): When DESTINATION is #f, use a
  Unicode-capable output string port.

* test-suite/tests/format.test ("format basic output")["default to
  Unicode-capable port"]: New test.
This commit is contained in:
Ludovic Courtès 2011-02-08 23:14:00 +01:00
parent 05e0e22bc5
commit 1497e87a4f
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
module/ice-9/format.scm
View file

@ -41,7 +41,10 @@
(let* ((port
(cond
((not destination) (open-output-string))
((not destination)
;; Use a Unicode-capable output string port.
(with-fluids ((%default-port-encoding "UTF-8"))
(open-output-string)))
((boolean? destination) (current-output-port)) ; boolean but not false
((output-port? destination) destination)
((number? destination)

14
test-suite/tests/format.test
View file

@ -1,18 +1,18 @@
;;;; format.test --- test suite for Guile's CL-ish format -*- scheme -*-
;;;; Matthias Koeppe <mkoeppe@mail.math.uni-magdeburg.de> --- June 2001
;;;;
;;;; Copyright (C) 2001, 2003, 2004, 2006, 2010 Free Software Foundation, Inc.
;;;;
;;;; Copyright (C) 2001, 2003, 2004, 2006, 2010, 2011 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
;;;; License as published by the Free Software Foundation; either
;;;; version 3 of the License, or (at your option) any later version.
;;;;
;;;;
;;;; This library is distributed in the hope that it will be useful,
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;;;; Lesser General Public License for more details.
;;;;
;;;;
;;;; You should have received a copy of the GNU Lesser General Public
;;;; License along with this library; if not, write to the Free Software
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@ -25,6 +25,12 @@
;;; FORMAT Basic Output
(with-test-prefix "format basic output"
(pass-if "default to Unicode-capable port"
;; `(format #f ...)' should be able to deal with Unicode characters.
(with-fluids ((%default-port-encoding "ISO-8859-1"))
(let ((alpha (integer->char #x03b1))) ; GREEK SMALL LETTER ALPHA
(= 1 (string-length (format #f (string alpha)))))))
(pass-if "format ~% produces a new line"
(string=? (format #f "~%") "\n"))
(pass-if "format ~& starts a fresh line"