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

clean up teh newb code

db4
Doug Coleman 2008-11-21 22:31:05 -06:00
parent de7b002baf
commit 3909c42962
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
basis/mime/multipart/multipart.factor
View File

@ -24,38 +24,32 @@ TUPLE: multipart-stream stream n leftover separator ;
[ f ] change-leftover
[ n>> ] [ stream>> ] bi stream-read [ ?append ] keep not ;
: multipart-split ( bytes separator -- before after ? empty? )
#! first boolean: return true if found
#! second boolean: true if sequence=
2dup sequence= [
2drop f f f t
] [
split1 dup >boolean f
] if ;
: multipart-split ( bytes separator -- before after seq=? )
2dup sequence= [ 2drop f f t ] [ split1 f ] if ;
PRIVATE>
:: multipart-step ( stream bytes end-stream? separator quot: ( bytes -- ) -- ? end-stream? )
#! return t to loop again
bytes separator multipart-split [
bytes separator multipart-split [ dup >boolean ] dip [
! separator == input
3drop f quot call f
] [
[
! found
[ [ quot call ] unless-empty ]
[ quot unless-empty ]
[
stream (>>leftover)
[ quot call ] unless-empty
quot unless-empty
] if-empty f quot call f
] [
! not found
drop
end-stream? [
[ quot call ] unless-empty f
quot unless-empty f
] [
separator length 1- ?cut* stream (>>leftover)
[ quot call ] unless-empty t
quot unless-empty t
] if
] if
] if stream leftover>> end-stream? not or ;