From 69ec12c2dc194110175c5ed8aadfcb9e87754cfb Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 25 Mar 2011 12:20:51 -0700 Subject: [PATCH 1/3] io: improve signature of each-block and each-line. --- core/io/io.factor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/io/io.factor b/core/io/io.factor index ea37c13dd7..0821cfff78 100644 --- a/core/io/io.factor +++ b/core/io/io.factor @@ -90,10 +90,10 @@ SYMBOL: error-stream PRIVATE> -: each-stream-line ( stream quot -- ) +: each-stream-line ( stream quot: ( ... line -- ... ) -- ) swap [ stream-readln ] curry each-morsel ; inline -: each-line ( quot -- ) +: each-line ( quot: ( ... line -- ... ) -- ) input-stream get swap each-stream-line ; inline : stream-lines ( stream -- seq ) @@ -111,10 +111,10 @@ PRIVATE> : contents ( -- seq ) input-stream get stream-contents ; inline -: each-stream-block ( stream quot: ( block -- ) -- ) +: each-stream-block ( stream quot: ( ... block -- ... ) -- ) swap [ 8192 swap stream-read-partial ] curry each-morsel ; inline -: each-block ( quot: ( block -- ) -- ) +: each-block ( quot: ( ... block -- ... ) -- ) input-stream get swap each-stream-block ; inline : stream-copy ( in out -- ) From 3523d24785b069e8a97b8bebef62cc478f5dd0a6 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 25 Mar 2011 13:58:16 -0700 Subject: [PATCH 2/3] io: implement "stream-contents" in terms of "each-stream-block". --- core/io/io.factor | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/io/io.factor b/core/io/io.factor index 0821cfff78..bd1bf27985 100644 --- a/core/io/io.factor +++ b/core/io/io.factor @@ -102,21 +102,21 @@ PRIVATE> : lines ( -- seq ) input-stream get stream-lines ; inline +: each-stream-block ( stream quot: ( ... block -- ... ) -- ) + swap 65536 swap [ stream-read-partial ] 2curry each-morsel ; inline + +: each-block ( quot: ( ... block -- ... ) -- ) + input-stream get swap each-stream-block ; inline + : stream-contents ( stream -- seq ) [ - [ [ 65536 swap stream-read-partial dup ] curry [ ] produce nip ] + [ [ ] collector [ each-stream-block ] dip { } like ] [ stream-element-exemplar concat-as ] bi ] with-disposal ; : contents ( -- seq ) input-stream get stream-contents ; inline -: each-stream-block ( stream quot: ( ... block -- ... ) -- ) - swap [ 8192 swap stream-read-partial ] curry each-morsel ; inline - -: each-block ( quot: ( ... block -- ... ) -- ) - input-stream get swap each-stream-block ; inline - : stream-copy ( in out -- ) [ [ [ write ] each-block ] with-output-stream ] curry with-input-stream ; From f9ccaf37ec7b286fb5cfd2196c45a299204bdf27 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 25 Mar 2011 18:30:52 -0700 Subject: [PATCH 3/3] io: improve stack effects. --- core/io/io.factor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/io/io.factor b/core/io/io.factor index bd1bf27985..a4b93f3f82 100644 --- a/core/io/io.factor +++ b/core/io/io.factor @@ -90,10 +90,10 @@ SYMBOL: error-stream PRIVATE> -: each-stream-line ( stream quot: ( ... line -- ... ) -- ) +: each-stream-line ( ... stream quot: ( ... line -- ... ) -- ... ) swap [ stream-readln ] curry each-morsel ; inline -: each-line ( quot: ( ... line -- ... ) -- ) +: each-line ( ... quot: ( ... line -- ... ) -- ... ) input-stream get swap each-stream-line ; inline : stream-lines ( stream -- seq ) @@ -102,10 +102,10 @@ PRIVATE> : lines ( -- seq ) input-stream get stream-lines ; inline -: each-stream-block ( stream quot: ( ... block -- ... ) -- ) +: each-stream-block ( ... stream quot: ( ... block -- ... ) -- ... ) swap 65536 swap [ stream-read-partial ] 2curry each-morsel ; inline -: each-block ( quot: ( ... block -- ... ) -- ) +: each-block ( ... quot: ( ... block -- ... ) -- ... ) input-stream get swap each-stream-block ; inline : stream-contents ( stream -- seq )