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

peek-char-and-len/iconv uses both returns from fill-input

Browse source 
* module/ice-9/ports.scm (peek-char-and-len/iconv): Use buffered value
  from fill-input.
This commit is contained in:
Andy Wingo 2016-05-10 15:37:42 +02:00
parent 9c02ede07e
commit 3ccfa213c1
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
module/ice-9/ports.scm
View file

@ -419,24 +419,25 @@ interpret its input and output."
(define (peek-char-and-len/iconv port first-byte)
(let lp ((prev-input-size 0))
(let* ((input-size (1+ prev-input-size))
(buf (fill-input port input-size))
(cur (port-buffer-cur buf)))
(cond
((< (- (port-buffer-end buf) cur) input-size)
;; Buffer failed to fill; EOF, possibly premature.
(cond
((zero? prev-input-size)
(values the-eof-object 0))
((eq? (port-conversion-strategy port) 'substitute)
(values #\? prev-input-size))
(else
(decoding-error "peek-char" port))))
((port-decode-char port (port-buffer-bytevector buf) cur input-size)
=> (lambda (char)
(values char input-size)))
(else
(lp input-size))))))
(let ((input-size (1+ prev-input-size)))
(call-with-values (lambda () (fill-input port input-size))
(lambda (buf buffered)
(cond
((< buffered input-size)
;; Buffer failed to fill; EOF, possibly premature.
(cond
((zero? prev-input-size)
(values the-eof-object 0))
((eq? (port-conversion-strategy port) 'substitute)
(values #\? prev-input-size))
(else
(decoding-error "peek-char" port))))
((port-decode-char port (port-buffer-bytevector buf)
(port-buffer-cur buf) input-size)
=> (lambda (char)
(values char input-size)))
(else
(lp input-size))))))))
(define (peek-char-and-len port)
(let ((first-byte (peek-byte port)))