diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-06-20 15:49:42 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-06-20 15:50:27 +0200 |
commit | ecb48dccbac6b8fdd969f50a23351ef7f4b91ce5 (patch) | |
tree | 3631d7a13be63e229ee35daa188764bcb262829a /module/srfi/srfi-6.scm | |
parent | 2cb363622d03b18402d6ee15c8c87d8fee9bfc32 (diff) | |
download | guile-ecb48dccbac6b8fdd969f50a23351ef7f4b91ce5.tar.gz |
Make SRFI-6 string ports Unicode-capable.
Partly addresses <http://bugs.gnu.org/11197>.
Reported by Klaus Stehle <klaus.stehle@uni-tuebingen.de>.
* module/srfi/srfi-6.scm (open-input-string, open-output-string): New
procedures.
* test-suite/tests/srfi-6.test ("open-input-string")["read-char,
Unicode"]: New test.
("open-output-string")["λ"]: New test.
Diffstat (limited to 'module/srfi/srfi-6.scm')
-rw-r--r-- | module/srfi/srfi-6.scm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/module/srfi/srfi-6.scm b/module/srfi/srfi-6.scm index 098b586cc..7b8bcb114 100644 --- a/module/srfi/srfi-6.scm +++ b/module/srfi/srfi-6.scm @@ -1,6 +1,6 @@ ;;; srfi-6.scm --- Basic String Ports -;; Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2006, 2012 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 @@ -23,10 +23,20 @@ ;;; Code: (define-module (srfi srfi-6) - #:re-export (open-input-string open-output-string get-output-string)) + #:replace (open-input-string open-output-string) + #:re-export (get-output-string)) -;; Currently, guile provides these functions by default, so no action -;; is needed, and this file is just a placeholder. +;; SRFI-6 says nothing about encodings, and assumes that any character +;; or string can be written to a string port. Thus, make all SRFI-6 +;; string ports Unicode capable. See <http://bugs.gnu.org/11197>. + +(define (open-input-string s) + (with-fluids ((%default-port-encoding "UTF-8")) + ((@ (guile) open-input-string) s))) + +(define (open-output-string) + (with-fluids ((%default-port-encoding "UTF-8")) + ((@ (guile) open-output-string)))) (cond-expand-provide (current-module) '(srfi-6)) |