Commit 1ce95fef639633695afb30e464b381a083bda7fa
2017-05-28T14:20:36
Input, output, io streams.
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 58 59 60 61 62 63 64 65
diff --git a/fd-flexi.lisp b/fd-flexi.lisp
index 63be835..6936e12 100644
--- a/fd-flexi.lisp
+++ b/fd-flexi.lisp
@@ -18,11 +18,38 @@
(in-package :fd-flexi)
-(defun stream (fd &key (external-format :utf-8))
- (make-flexi-stream (make-instance 'fd-gray:stream :fd fd)
+(defun input-stream (fd &optional (external-format :utf-8))
+ (make-flexi-stream (fd-gray:input-stream fd)
:external-format external-format))
-(defmacro with-stream ((var fd &key (external-format :utf-8)) &body body)
- `(let ((,var (stream ,fd :external-format ,external-format)))
- (unwind-protect (progn ,@body)
- (close ,var))))
+(defmacro with-input-stream ((var fd &optional (external-format :utf-8))
+ &body body)
+ (let ((stream (gensym "STREAM-")))
+ `(let ((,stream (input-stream ,fd ,external-format)))
+ (unwind-protect (let ((,var ,stream))
+ ,@body)
+ (close ,stream)))))
+
+(defun output-stream (fd &optional (external-format :utf-8))
+ (make-flexi-stream (fd-gray:output-stream fd)
+ :external-format external-format))
+
+(defmacro with-output-stream ((var fd &optional (external-format :utf-8))
+ &body body)
+ (let ((stream (gensym "STREAM-")))
+ `(let ((,stream (output-stream ,fd ,external-format)))
+ (unwind-protect (let ((,var ,stream))
+ ,@body)
+ (close ,stream)))))
+
+(defun io-stream (fd &optional (external-format :utf-8))
+ (make-flexi-stream (fd-gray:io-stream fd)
+ :external-format external-format))
+
+(defmacro with-io-stream ((var fd &optional (external-format :utf-8))
+ &body body)
+ (let ((stream (gensym "STREAM-")))
+ `(let ((,stream (io-stream ,fd ,external-format)))
+ (unwind-protect (let ((,var ,stream))
+ ,@body)
+ (close ,stream)))))
diff --git a/package.lisp b/package.lisp
index 29067a0..4285253 100644
--- a/package.lisp
+++ b/package.lisp
@@ -25,5 +25,9 @@
(:shadow
#:stream)
(:export
- #:stream
- #:with-stream))
+ #:input-stream
+ #:with-input-stream
+ #:output-stream
+ #:with-output-stream
+ #:io-stream
+ #:with-io-stream))