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

Have `scm_getc' honor the port's conversion strategy.

Browse source 
* libguile/ports.c (get_codepoint): Reset `pt->input_cd' upon failure.
  If `pt->ilseq_handler' is `SCM_ICONVEH_QUESTION_MARK', then return a
  question mark.
  [failure]: Use `scm_encoding_error' when raising an error.

* test-suite/lib.scm (exception:encoding-error): Adjust regexp.

* test-suite/tests/ports.test ("string ports")["read-char, wrong
  encoding, error", "read-char, wrong encoding, escape", "read-char,
  wrong encoding, substitute"]: New tests.
This commit is contained in:
Ludovic Courtès 2011-01-26 00:16:10 +01:00
parent 2e59af2100
commit cc540d0bbd
3 changed files with 52 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test-suite/lib.scm
View file

@ -1,5 +1,6 @@
;;;; test-suite/lib.scm --- generic support for testing
;;;; Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
;;;; Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2009, 2010,
;;;; 2011 Free Software Foundation, Inc.
;;;;
;;;; This program is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@ -279,7 +280,7 @@
(define exception:system-error
(cons 'system-error ".*"))
(define exception:encoding-error
(cons 'encoding-error "(cannot convert to output locale|input locale conversion error)"))
(cons 'encoding-error "(cannot convert to output locale|input (locale conversion|decoding) error)"))
(define exception:miscellaneous-error
(cons 'misc-error "^.*"))
(define exception:read-error

29
test-suite/tests/ports.test
View file

@ -23,7 +23,8 @@
#:use-module (test-suite guile-test)
#:use-module (ice-9 popen)
#:use-module (ice-9 rdelim)
#:use-module (rnrs bytevectors))
#:use-module (rnrs bytevectors)
#:use-module ((rnrs io ports) #:select (open-bytevector-input-port)))
(define (display-line . args)
(for-each display args)
@ -461,7 +462,31 @@
(char=? (peek-char p) #\안)
(char=? (peek-char p) #\안)
(= (port-line p) 0)
(= (port-column p) 0)))))
(= (port-column p) 0))))
(pass-if-exception "read-char, wrong encoding, error"
exception:encoding-error
(let ((p (with-fluids ((%default-port-encoding "UTF-8"))
(open-bytevector-input-port #vu8(255 1 2 3)))))
(set-port-conversion-strategy! p 'error)
(read-char p)
#t))
(pass-if-exception "read-char, wrong encoding, escape"
exception:encoding-error
;; `escape' should behave like `error'.
(let ((p (with-fluids ((%default-port-encoding "UTF-8"))
(open-bytevector-input-port #vu8(255 1 2 3)))))
(set-port-conversion-strategy! p 'escape)
(read-char p)
#t))
(pass-if "read-char, wrong encoding, substitute"
(let ((p (with-fluids ((%default-port-encoding "UTF-8"))
(open-bytevector-input-port #vu8(255 206 187 206 188)))))
(set-port-conversion-strategy! p 'substitute)
(equal? (list (read-char p) (read-char p) (read-char p))
'(#\? #\λ #\μ)))))
(with-test-prefix "call-with-output-string"