From 69229032c23e12b6918693898d4c6ae7fd0567a1 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 28 Sep 2009 15:51:40 -0500 Subject: [PATCH] define a method on stream-element-type, fix a bug in unlimited-input and add a unit test --- basis/io/streams/limited/limited-tests.factor | 9 ++++++++- basis/io/streams/limited/limited.factor | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/basis/io/streams/limited/limited-tests.factor b/basis/io/streams/limited/limited-tests.factor index 86d652d17c..f052be3b74 100644 --- a/basis/io/streams/limited/limited-tests.factor +++ b/basis/io/streams/limited/limited-tests.factor @@ -81,4 +81,11 @@ IN: io.streams.limited.tests "HELLO" [ f stream-throws limit-input 4 read ] with-string-reader -] unit-test \ No newline at end of file +] unit-test + + +[ "asdf" ] [ + "asdf" 2 stream-eofs [ + unlimited-input contents + ] with-input-stream +] unit-test diff --git a/basis/io/streams/limited/limited.factor b/basis/io/streams/limited/limited.factor index 1b0e155762..c71e99ab91 100755 --- a/basis/io/streams/limited/limited.factor +++ b/basis/io/streams/limited/limited.factor @@ -37,7 +37,7 @@ M: decoder unlimited ( stream -- stream' ) [ stream>> ] change-stream ; M: object unlimited ( stream -- stream' ) - stream>> stream>> ; + stream>> ; : limit-input ( limit mode -- ) [ input-stream ] 2dip '[ _ _ limit ] change ; @@ -103,3 +103,6 @@ M: limited-stream stream-seek M: limited-stream dispose stream>> dispose ; + +M: limited-stream stream-element-type + stream>> stream-element-type ;