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

Make SRFI-6 string ports Unicode-capable.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2012-06-20 15:49:42 +02:00
parent 2cb363622d
commit ecb48dccba
2 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
module/srfi/srfi-6.scm
View file

@ -1,6 +1,6 @@
;;; srfi-6.scm --- Basic String Ports ;;; 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 ;; This library is free software; you can redistribute it and/or
;; modify it under the terms of the GNU Lesser General Public ;; modify it under the terms of the GNU Lesser General Public
@ -23,10 +23,20 @@
;;; Code: ;;; Code:
(define-module (srfi srfi-6) (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 ;; SRFI-6 says nothing about encodings, and assumes that any character
;; is needed, and this file is just a placeholder. ;; 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)) (cond-expand-provide (current-module) '(srfi-6))

26
test-suite/tests/srfi-6.test
View file

@ -1,6 +1,6 @@
;;;; srfi-6.test --- test suite for SRFI-6 -*- scheme -*- ;;;; 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 ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -37,13 +37,21 @@
(char=? #\y (read-char port)) (char=? #\y (read-char port))
(char=? #\z (read-char port)) (char=? #\z (read-char port))
(eof-object? (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" (with-test-prefix "unread-char"
(pass-if "one char" (pass-if "one char"
(let ((port (open-input-string ""))) (let ((port (open-input-string "")))
(unread-char #\x port) (unread-char #\x port)
(and (char=? #\x (read-char port)) (and (char=? #\x (read-char port))
(eof-object? (read-char port))))) (eof-object? (read-char port)))))
(pass-if "after eof" (pass-if "after eof"
@ -75,7 +83,15 @@
(let ((port (open-output-string))) (let ((port (open-output-string)))
(display "xyz" port) (display "xyz" port)
(string=? "xyz" (get-output-string 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" (pass-if "seek"
(let ((port (open-output-string))) (let ((port (open-output-string)))
(display "abcdef" port) (display "abcdef" port)