Commit b7e370606069f04bf03d83437fb9eae48ad847ca
2017-06-18T14:37:09
read
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/babel-stream.lisp b/babel-stream.lisp
index 258c41b..e7a39c3 100644
--- a/babel-stream.lisp
+++ b/babel-stream.lisp
@@ -38,7 +38,39 @@
'character)
(defclass babel-input-stream (babel-stream input-stream)
- ())
+ ((bytes :initform (make-array '(8) :element-type '(unsigned-byte 8))
+ :reader stream-bytes
+ :type (array (unsigned-byte 8)))
+ (bytes-length :initform 0
+ :accessor stream-bytes-length
+ :type fixnum+)))
+
+(defmethod read ((stream babel-input-stream))
+ (let* ((underlying-stream (stream-underlying-stream stream))
+ (bytes (stream-bytes stream))
+ (encoding (stream-external-format stream))
+ (mapping (babel::lookup-mapping babel::*string-vector-mappings*
+ encoding)))
+ (loop
+ (multiple-value-bind (element state) (read underlying-stream)
+ (case state
+ ((nil)
+ (setf (aref bytes (stream-bytes-length stream)) element)
+ (incf (stream-bytes-length stream))
+ (handler-case
+ (let ((string (make-string 1)))
+ (when (= 1 (funcall (the function (babel::decoder mapping))
+ bytes 0 (stream-bytes-length stream)
+ string 0))
+ (setf (stream-bytes-length stream) 0)
+ (return (values (char string 0) nil))))
+ (babel-encodings:end-of-input-in-character ())))
+ ((:eof)
+ (return (values nil :eof)))
+ ((:non-blocking)
+ (return (values nil :non-blocking)))
+ (otherwise
+ (error 'stream-input-error :stream stream)))))))
(defclass babel-output-stream (babel-stream output-stream)
())
@@ -57,6 +89,11 @@
(defmethod flush ((stream babel-output-stream))
(flush (stream-underlying-stream stream)))
+#+test
+(let ((s (make-instance 'babel-input-stream
+ :stream (fd-stream:fd-input-stream 0))))
+ (read-line s))
+
(let ((s (make-instance 'babel-output-stream
:stream (fd-stream:fd-output-stream 1))))
(write s #\é)