Commit dc241ba989aca958c46f1534da5a28258633148a
2018-02-05T02:00:46
STREAM-
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
diff --git a/babel-stream.lisp b/babel-stream.lisp
index 23bd75f..1630750 100644
--- a/babel-stream.lisp
+++ b/babel-stream.lisp
@@ -45,14 +45,15 @@
:accessor stream-bytes-length
:type fixnum+)))
-(defmethod read ((stream babel-input-stream))
+(defmethod stream-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)
+ (multiple-value-bind (element state) (stream-read
+ underlying-stream)
(case state
((nil)
(setf (aref bytes (stream-bytes-length stream)) element)
@@ -85,11 +86,12 @@
(defclass babel-output-stream (babel-stream output-stream)
())
-(defmethod write ((stream babel-output-stream) (element fixnum))
+(defmethod stream-write ((stream babel-output-stream) (element fixnum))
(assert (typep element '(unsigned-byte 8)))
(write (stream-underlying-stream stream) element))
-(defmethod write ((stream babel-output-stream) (element character))
+(defmethod stream-write ((stream babel-output-stream)
+ (element character))
(let* ((encoding (stream-external-format stream))
(mapping (babel::lookup-mapping babel::*string-vector-mappings*
encoding))
@@ -100,8 +102,8 @@
(write-sequence (stream-underlying-stream stream)
bytes :end length)))
-(defmethod flush ((stream babel-output-stream))
- (flush (stream-underlying-stream stream)))
+(defmethod stream-flush ((stream babel-output-stream))
+ (stream-flush (stream-underlying-stream stream)))
(defmethod stream-flush-output-buffer ((stream babel-output-stream))
(stream-flush-output-buffer (stream-underlying-stream stream)))