mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
6dce942c46
* libguile/strports.c (scm_mkstrport): Use UTF-8; ignore
%default-port-encoding. Rename 'str_len' and 'c_pos' to
'num_bytes' and 'c_byte_pos'. Interpret 'pos' argument
as a character index instead of a byte index.
* module/ice-9/boot-9.scm (%cond-expand-features): Add srfi-6 to the
list of core features.
* module/srfi/srfi-6.scm (open-input-string, open-output-string): Simply
re-export these, since the core versions are now compliant.
* doc/ref/api-io.texi (String Ports): Remove text that describes
non-compliant behavior of string ports with regard to encoding.
* doc/ref/srfi-modules.texi (SRFI-0): Add srfi-6 to the list of
core features.
(SRFI-6): Remove text that mentions non-compliant behavior of
core string ports.
* module/ice-9/format.scm (format):
* module/ice-9/pretty-print.scm (truncated-print):
* module/rnrs/io/ports.scm (open-string-input-port,
open-string-output-port):
* test-suite/test-suite/lib.scm (format-test-name):
* test-suite/tests/chars.test ("combining accent is pretty-printed",
"combining X is pretty-printed"):
* test-suite/tests/ecmascript.test (eread, eread/1):
* test-suite/tests/rdelim.test:
* test-suite/tests/reader.test (read-string):
* test-suite/tests/regexp.test:
* test-suite/tests/srfi-105.test (read-string): Don't set
%default-port-encoding before creating string ports.
* benchmark-suite/benchmarks/ports.bm (%latin1-port): Use
'set-port-encoding!' to set the string port encoding.
(%utf8/ascii-port, %utf8/wide-port, "rdelim"): Don't set
%default-port-encoding before creating string ports.
* test-suite/tests/r6rs-ports.test ("lookahead-u8 non-ASCII"): Don't set
%default-port-encoding before creating string ports.
("put-bytevector with UTF-16 string port", "put-bytevector with
wrong-encoding string port"): Use 'set-port-encoding!' to set the
string port encoding.
* test-suite/tests/print.test (tprint): Use 'set-port-encoding!' to set
the string port encoding.
("truncated-print"): Use 'pass-if-equal'.
* test-suite/tests/ports.test ("encoding failure leads to exception",
"%default-port-encoding is honored", "peek-char [latin-1]", "peek-char
[utf-8]", "peek-char [utf-16]"): Remove tests.
("%default-port-encoding is ignored", "peek-char"): Add tests.
("suitable encoding [latin-1]", "suitable encoding [latin-3]",
"wrong encoding, error", "wrong encoding, substitute",
"wrong encoding, escape"): Use 'set-port-encoding!' to set the
string port encoding.
("%default-port-encoding, wrong encoding"): Rewrite to use
a file port instead of a string port.
89 lines
2.6 KiB
Scheme
89 lines
2.6 KiB
Scheme
;;;; -*- coding: utf-8; mode: scheme; -*-
|
||
;;;;
|
||
;;;; Copyright (C) 2010, 2013 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
|
||
|
||
(define-module (test-suite test-print)
|
||
#:use-module (ice-9 pretty-print)
|
||
#:use-module (test-suite lib))
|
||
|
||
(define-syntax prints?
|
||
;; #t if EXP prints as RESULT.
|
||
(syntax-rules ()
|
||
((_ exp result)
|
||
(string=? result
|
||
(with-output-to-string
|
||
(lambda ()
|
||
(pretty-print 'exp)))))))
|
||
|
||
|
||
(with-test-prefix "pretty-print"
|
||
|
||
(pass-if "pair"
|
||
(prints? (a . b) "(a . b)\n"))
|
||
|
||
(pass-if "list"
|
||
(prints? (a b c) "(a b c)\n"))
|
||
|
||
(pass-if "dotted list"
|
||
(prints? (a b . c) "(a b . c)\n"))
|
||
|
||
(pass-if "quote"
|
||
(prints? 'foo "'foo\n"))
|
||
|
||
(pass-if "non-starting quote"
|
||
(prints? (foo 'bar) "(foo 'bar)\n"))
|
||
|
||
(pass-if "nested quote"
|
||
(prints? (''foo) "(''foo)\n"))
|
||
|
||
(pass-if "quasiquote & co."
|
||
(prints? (define foo `(bar ,(+ 2 3)))
|
||
"(define foo `(bar ,(+ 2 3)))\n")))
|
||
|
||
|
||
(with-test-prefix "truncated-print"
|
||
(define exp '(a b #(c d e) f . g))
|
||
|
||
(define (tprint x width encoding)
|
||
(call-with-output-string
|
||
(lambda (p)
|
||
(set-port-encoding! p encoding)
|
||
(truncated-print x p #:width width))))
|
||
|
||
(pass-if-equal "(a b . #)"
|
||
(tprint exp 10 "ISO-8859-1"))
|
||
|
||
(pass-if-equal "(a b # f . g)"
|
||
(tprint exp 15 "ISO-8859-1"))
|
||
|
||
(pass-if-equal "(a b #(c ...) . #)"
|
||
(tprint exp 18 "ISO-8859-1"))
|
||
|
||
(pass-if-equal "(a b #(c d e) f . g)"
|
||
(tprint exp 20 "ISO-8859-1"))
|
||
|
||
(pass-if-equal "\"The quick brown...\""
|
||
(tprint "The quick brown fox" 20 "ISO-8859-1"))
|
||
|
||
(pass-if-equal "\"The quick brown f…\""
|
||
(tprint "The quick brown fox" 20 "UTF-8"))
|
||
|
||
(pass-if-equal "#<directory (tes...>"
|
||
(tprint (current-module) 20 "ISO-8859-1"))
|
||
|
||
(pass-if-equal "#<directory (test-…>"
|
||
(tprint (current-module) 20 "UTF-8")))
|