summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Gran <spk121@yahoo.com>2018-04-25 20:36:43 -0700
committerMichael Gran <spk121@yahoo.com>2018-04-25 20:36:43 -0700
commitcd2d5a2500d23f2cd4707011a0806f0b02536894 (patch)
tree12b05a43911f8be9df1fd75456b150deee301a23
parentd5b48cb0395175db8a04875269f3284c90c0d436 (diff)
downloadguile-cd2d5a2500d23f2cd4707011a0806f0b02536894.tar.gz
Let suspendable ports' read-line handle alternate line endings
Handle CRLF, NEL, LS and PS to match the new C implementation. * module/ice-9/suspendable-ports.scm (%read-line): handle alternate line endings (read-line): use new %read-line
-rw-r--r--module/ice-9/suspendable-ports.scm82
1 files changed, 77 insertions, 5 deletions
diff --git a/module/ice-9/suspendable-ports.scm b/module/ice-9/suspendable-ports.scm
index a366c8b9c..3b258492e 100644
--- a/module/ice-9/suspendable-ports.scm
+++ b/module/ice-9/suspendable-ports.scm
@@ -1,5 +1,5 @@
;;; Ports, implemented in Scheme
-;;; Copyright (C) 2016 Free Software Foundation, Inc.
+;;; Copyright (C) 2016, 2018 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
@@ -637,12 +637,84 @@
(or (eqv? char (string-ref delims i))
(lp (1+ i)))))))))))
+(define* (%read-line port)
+ (let ((LINE_BUFFER_SIZE 256))
+ (let ((strings #f)
+ (result #f)
+ (buf (make-string LINE_BUFFER_SIZE #\nul))
+ (delim #f)
+ (index 0)
+ (cr #f)
+ (go #t))
+ (cond
+ ((not (input-port? port))
+ (error "Not an input port." port))
+ (else
+ (while go
+ (cond
+ ((>= index LINE_BUFFER_SIZE)
+ (set! strings (cons (substring buf 0 index)
+ (or strings '())))
+ (set! index 0))
+ (else
+ (let ((c (read-char port)))
+ (cond
+ ((or (eof-object? c)
+ (char=? c #\x85)
+ (char=? c #\x2028)
+ (char=? c #\x2029))
+ (set! cr #f)
+ (set! delim c))
+ ((char=? c #\newline)
+ (set! delim c))
+ ((char=? c #\return)
+ (set! cr #t)
+ (string-set! buf index c)
+ (set! index (1+ index)))
+ (else
+ (set! cr #f)
+ (string-set! buf index c)
+ (set! index (1+ index)))))))
+
+ (if (or (eof-object? delim)
+ (char? delim))
+ (set! go #f)))
+ (let ((line (if (not strings)
+ ;; A short string.
+ (if cr
+ (substring buf 0 (1- index))
+ (substring buf 0 index))
+ ;; Else, aggregate the intermediary results.
+ (begin
+ (if cr
+ (set! strings (cons (substring buf 0 (1- index)) strings))
+ (set! strings (cons (substring buf 0 index) strings)))
+ (apply string-append (reverse strings))))))
+
+ (if (and (eof-object? delim)
+ (zero? (string-length line)))
+ (cons the-eof-object the-eof-object)
+ ;; Else
+ (if cr
+ (cons line "\r\n")
+ (cons line delim)))))))))
+
(define* (read-line #:optional (port (current-input-port))
(handle-delim 'trim))
- (read-delimited "\n" port handle-delim))
-
-(define* (%read-line port)
- (read-line port 'split))
+ (let* ((line/delim (%read-line port))
+ (line (car line/delim))
+ (delim (cdr line/delim)))
+ (case handle-delim
+ ((trim) line)
+ ((split) line/delim)
+ ((concat) (if (and (string? line) (char? delim))
+ (string-append line (string delim))
+ line))
+ ((peek) (if (char? delim)
+ (unread-char delim port))
+ line)
+ (else
+ (error "unexpected handle-delim value: " handle-delim)))))
(define* (put-string port str #:optional (start 0)
(count (- (string-length str) start)))