summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-06-20 15:49:42 +0200
committerLudovic Courtès <ludo@gnu.org>2012-06-20 15:50:27 +0200
commitecb48dccbac6b8fdd969f50a23351ef7f4b91ce5 (patch)
tree3631d7a13be63e229ee35daa188764bcb262829a
parent2cb363622d03b18402d6ee15c8c87d8fee9bfc32 (diff)
downloadguile-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.
-rw-r--r--module/srfi/srfi-6.scm18
-rw-r--r--test-suite/tests/srfi-6.test26
2 files changed, 35 insertions, 9 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))
diff --git a/test-suite/tests/srfi-6.test b/test-suite/tests/srfi-6.test
index 68fc70dff..bd9167cca 100644
--- a/test-suite/tests/srfi-6.test
+++ b/test-suite/tests/srfi-6.test
@@ -1,6 +1,6 @@
;;;; srfi-6.test --- test suite for SRFI-6 -*- scheme -*-
;;;;
-;;;; Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+;;;; Copyright (C) 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
@@ -37,13 +37,21 @@
(char=? #\y (read-char port))
(char=? #\z (read-char port))
(eof-object? (read-char port)))))
-
+
+ (pass-if "read-char, Unicode"
+ ;; String ports should always be Unicode-capable.
+ ;; See <http://bugs.gnu.org/11197>.
+ (with-fluids ((%default-port-encoding "ISO-8859-1"))
+ (let ((port (open-input-string "λμ")))
+ (and (char=? #\λ (read-char port))
+ (char=? #\μ (read-char port))))))
+
(with-test-prefix "unread-char"
(pass-if "one char"
(let ((port (open-input-string "")))
- (unread-char #\x port)
- (and (char=? #\x (read-char port))
+ (unread-char #\x port)
+ (and (char=? #\x (read-char port))
(eof-object? (read-char port)))))
(pass-if "after eof"
@@ -75,7 +83,15 @@
(let ((port (open-output-string)))
(display "xyz" port)
(string=? "xyz" (get-output-string port))))
-
+
+ (pass-if "λ"
+ ;; Writing to an output string should always work.
+ ;; See <http://bugs.gnu.org/11197>.
+ (with-fluids ((%default-port-encoding "ISO-8859-1"))
+ (let ((port (open-output-string)))
+ (display "λ" port)
+ (string=? "λ" (get-output-string port)))))
+
(pass-if "seek"
(let ((port (open-output-string)))
(display "abcdef" port)