steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

io.encodings: this appears to be faster and produce smaller code.

db4
John Benediktsson 2013-03-15 12:15:52 -07:00
parent 86b2dea8d5
commit ee1eb8bf09
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/io/encodings/encodings.factor
View File

@ -111,15 +111,18 @@ M: decoder stream-contents*
{ CHAR: \n [ line-ends\n ] } { CHAR: \n [ line-ends\n ] }
} case ; inline } case ; inline
! If the stop? branch is taken convert the sbuf to a string
! If sep is present, returns ``string sep'' (string can be "") ! If sep is present, returns ``string sep'' (string can be "")
! If sep is f, returns ``string f'' or ``f f'' ! If sep is f, returns ``string f'' or ``f f''
: (decoder-read-until) ( quot: ( -- char stop? ) -- string/f sep/f ) : read-until-loop ( buf quot: ( -- char stop? ) -- string/f sep/f )
[ 100 <sbuf> ] dip over [ push ] curry until dup call
[ "" like ] dip [ f like f ] unless* ; inline [ nip [ "" like ] dip [ f like f ] unless* ]
[ pick push read-until-loop ] if ; inline recursive
: decoder-read-until ( seps stream encoding -- string/f sep/f ) : decoder-read-until ( seps stream encoding -- string/f sep/f )
[ decode-char dup ] 2curry swap [ dupd member? ] curry [ decode-char dup ] 2curry swap [ dupd member? ] curry
[ [ drop f t ] if ] curry compose (decoder-read-until) ; inline [ [ drop f t ] if ] curry compose
[ 100 <sbuf> ] dip read-until-loop ; inline
M: decoder stream-read-until >decoder< decoder-read-until ; M: decoder stream-read-until >decoder< decoder-read-until ;