mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Merge commit '45a28515c1'

Browse source
This commit is contained in:
Andy Wingo 2014-02-07 14:43:42 +01:00
commit 0dbc5e571a
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libguile/r6rs-ports.c
View file

@ -387,9 +387,12 @@ cbip_fill_input (SCM port)
(c_port->read_buf == (unsigned char *) SCM_BYTEVECTOR_CONTENTS (bv));
if (buffered)
/* Make sure the buffer isn't corrupt. BV can be passed directly
to READ_PROC. */
assert (c_port->read_buf_size == SCM_BYTEVECTOR_LENGTH (bv));
{
/* Make sure the buffer isn't corrupt. BV can be passed directly
to READ_PROC. */
assert (c_port->read_buf_size == SCM_BYTEVECTOR_LENGTH (bv));
c_port->read_pos = (unsigned char *) SCM_BYTEVECTOR_CONTENTS (bv);
}
else
{
/* This is an unbuffered port. When called via the

20
test-suite/tests/r6rs-ports.test
View file

@ -23,6 +23,7 @@
#:use-module (test-suite guile-test)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (ice-9 match)
#:use-module (rnrs io ports)
#:use-module (rnrs io simple)
#:use-module (rnrs exceptions)
@ -456,6 +457,25 @@ not `set-port-position!'"
(u8-list->bytevector
(map char->integer (string->list "Port!")))))))
(pass-if-equal "custom binary input port buffered partial reads"
"Hello Port!"
;; Check what happens when READ! returns less than COUNT bytes.
(let* ((src (string->utf8 "Hello Port!"))
(chunks '(2 4 5)) ; provide 2 bytes, then 4, etc.
(offset 0)
(read! (lambda (bv start count)
(match chunks
((count rest ...)
(bytevector-copy! src offset bv start count)
(set! chunks rest)
(set! offset (+ offset count))
count)
(()
0))))
(port (make-custom-binary-input-port "the port"
read! #f #f #f)))
(get-string-all port)))
(pass-if-equal "custom binary input port unbuffered & 'port-position'"
'(0 2 5 11)
;; Check that the value returned by 'port-position' is correct, and