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

io.streams.sequence: make some errors into ERROR:. rename double paren word.

locals-and-roots
Doug Coleman 2016-03-25 03:00:07 -07:00
parent 92afdc3ad0
commit 9db94d33d6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/io/streams/sequence/sequence.factor
View File

@ -23,25 +23,27 @@ SLOT: i
: <sequence-copy> ( dst n src-i src dst-i -- n copy ) : <sequence-copy> ( dst n src-i src dst-i -- n copy )
[ ] curry 3curry dip <copy> ; inline [ ] curry 3curry dip <copy> ; inline
: ((sequence-read-unsafe)) ( n buf stream offset -- count ) : sequence-copy-unsafe ( n buf stream offset -- count )
[ [
[ (sequence-read-length) ] [ (sequence-read-length) ]
[ [ dup pick + ] change-i underlying>> ] bi [ [ dup pick + ] change-i underlying>> ] bi
] dip [ <sequence-copy> (copy) drop ] 3curry keep ; inline ] dip [ <sequence-copy> (copy) drop ] 3curry keep ; inline
ERROR: not-a-byte-array obj ;
: check-byte-array ( buf stream offset -- buf stream offset ) : check-byte-array ( buf stream offset -- buf stream offset )
pick byte-array? [ "not a byte array" throw ] unless ; inline pick byte-array? [ pick not-a-byte-array ] unless ; inline
ERROR: not-a-string obj ;
: check-string ( buf stream offset -- buf stream offset ) : check-string ( buf stream offset -- buf stream offset )
pick string? [ "not a string" throw ] unless ; inline pick string? [ pick not-a-string ] unless ; inline
: (sequence-read-unsafe) ( n buf stream -- count ) : (sequence-read-unsafe) ( n buf stream -- count )
[ integer>fixnum ] [ integer>fixnum ]
[ dup slice? [ [ seq>> ] [ from>> ] bi ] [ 0 ] if ] [ dup slice? [ [ seq>> ] [ from>> ] bi ] [ 0 ] if ]
[ [
swap over stream-element-type +byte+ eq? swap over stream-element-type +byte+ eq?
[ check-byte-array ((sequence-read-unsafe)) ] [ check-byte-array sequence-copy-unsafe ]
[ check-string ((sequence-read-unsafe)) ] if [ check-string sequence-copy-unsafe ] if
] tri* ; inline ] tri* ; inline
PRIVATE> PRIVATE>