From 0dd3dc770b93f05ccf98d70b858a21a3899cfc9f Mon Sep 17 00:00:00 2001 From: "U-C4\\Administrator" Date: Tue, 20 Jan 2009 12:04:20 -0600 Subject: [PATCH] remove duplication in io.streams.limited --- basis/io/streams/limited/limited.factor | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/basis/io/streams/limited/limited.factor b/basis/io/streams/limited/limited.factor index 339dd9f62d..d1e2433353 100755 --- a/basis/io/streams/limited/limited.factor +++ b/basis/io/streams/limited/limited.factor @@ -42,17 +42,18 @@ ERROR: bad-stream-mode mode ; ] when ; inline : maybe-read ( n limited-stream quot: ( n stream -- seq/f ) -- seq/f ) + [ adjust-limit ] dip pick 0 <= [ 3drop f ] [ [ stream>> ] dip call ] if ; inline M: limited-stream stream-read1 - 1 swap adjust-limit + 1 swap [ nip stream-read1 ] maybe-read ; M: limited-stream stream-read - adjust-limit [ stream-read ] maybe-read ; + [ stream-read ] maybe-read ; M: limited-stream stream-read-partial - adjust-limit [ stream-read-partial ] maybe-read ; + [ stream-read-partial ] maybe-read ; : (read-until) ( stream seps buf -- stream seps buf sep/f ) 3dup [ [ stream-read1 dup ] dip memq? ] dip