From 12a53bbdc0528b55b945f10e42f1446048f09608 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 6 Mar 2009 17:34:21 -0600 Subject: [PATCH 1/2] add seeking to byte-array streams --- basis/io/streams/byte-array/byte-array.factor | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/basis/io/streams/byte-array/byte-array.factor b/basis/io/streams/byte-array/byte-array.factor index b877e97cf1..16160cd42d 100644 --- a/basis/io/streams/byte-array/byte-array.factor +++ b/basis/io/streams/byte-array/byte-array.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: byte-arrays byte-vectors kernel io.encodings io.streams.string sequences io namespaces io.encodings.private accessors sequences.private -io.streams.sequence destructors ; +io.streams.sequence destructors math combinators ; IN: io.streams.byte-array : ( encoding -- stream ) @@ -20,6 +20,14 @@ M: byte-reader stream-read1 sequence-read1 ; M: byte-reader stream-read-until sequence-read-until ; M: byte-reader dispose drop ; +M: byte-reader stream-seek ( n seek-type stream -- ) + swap { + { seek-absolute [ (>>i) ] } + { seek-relative [ [ + ] change-i drop ] } + { seek-end [ dup underlying>> length >>i [ + ] change-i drop ] } + [ bad-seek-type ] + } case ; + : ( byte-array encoding -- stream ) [ B{ } like 0 byte-reader boa ] dip ; From a93c3d96b5fdf95a9a1ae65c3d822317f1e36aea Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 6 Mar 2009 17:35:33 -0600 Subject: [PATCH 2/2] add using --- basis/tools/annotations/annotations-tests.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/tools/annotations/annotations-tests.factor b/basis/tools/annotations/annotations-tests.factor index 2a65ea5236..9210c2cab1 100644 --- a/basis/tools/annotations/annotations-tests.factor +++ b/basis/tools/annotations/annotations-tests.factor @@ -1,5 +1,5 @@ USING: tools.test tools.annotations tools.time math parser eval -io.streams.string kernel ; +io.streams.string kernel strings ; IN: tools.annotations.tests : foo ; @@ -45,4 +45,4 @@ M: string blah-generic ; { string blah-generic } watch -[ ] [ "hi" blah-generic ] unit-test \ No newline at end of file +[ ] [ "hi" blah-generic ] unit-test