Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-21 14:49:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

read-line shouldn't include the trailing newline

Browse source
This commit is contained in:
Alex Shinn 2010-01-02 21:04:40 +09:00
parent e5232a08af
commit 33da981dba
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/chibi/io/io.scm
View file

@ -26,7 +26,14 @@
(let ((in (if (pair? o) (car o) (current-input-port))) (let ((in (if (pair? o) (car o) (current-input-port)))
(n (if (and (pair? o) (pair? (cdr o))) (car (cdr o)) 8192))) (n (if (and (pair? o) (pair? (cdr o))) (car (cdr o)) 8192)))
(let ((res (%read-line n in))) (let ((res (%read-line n in)))
(if (not res) eof res)))) (if (not res)
eof
(let ((len (string-length res)))
(if (and (> len 0) (eqv? #\newline (string-ref res (- len 1))))
(if (and (> len 1) (eqv? #\return (string-ref res (- len 2))))
(substring res 0 (- len 2))
(substring res 0 (- len 1)))
res))))))
(define (read-string n . o) (define (read-string n . o)
(let ((in (if (pair? o) (car o) (current-input-port)))) (let ((in (if (pair? o) (car o) (current-input-port))))