String ports use UTF-8; ignore %default-port-encoding.
authorMark H Weaver <mhw@netris.org>
Wed, 7 Aug 2013 04:46:34 +0000 (00:46 -0400)
committerMark H Weaver <mhw@netris.org>
Wed, 7 Aug 2013 05:22:22 +0000 (01:22 -0400)
commit6dce942c46494460369b8a93d3c657e1f6e57fed
treef8242c3dea0e724e78018a32c558f9d11d763bc5
parentd8d7c7bf5706ce7873257eb88f0a5cc01b541858
String ports use UTF-8; ignore %default-port-encoding.

* 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.
19 files changed:
benchmark-suite/benchmarks/ports.bm
doc/ref/api-io.texi
doc/ref/srfi-modules.texi
libguile/strports.c
module/ice-9/boot-9.scm
module/ice-9/format.scm
module/ice-9/pretty-print.scm
module/rnrs/io/ports.scm
module/srfi/srfi-6.scm
test-suite/test-suite/lib.scm
test-suite/tests/chars.test
test-suite/tests/ecmascript.test
test-suite/tests/ports.test
test-suite/tests/print.test
test-suite/tests/r6rs-ports.test
test-suite/tests/rdelim.test
test-suite/tests/reader.test
test-suite/tests/regexp.test
test-suite/tests/srfi-105.test