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

splitting: string-lines is optimized for strings. revert my previous slowdown of 50% or so. add a note so this won't happen again. oops.

locals-and-roots
Doug Coleman 2016-04-05 21:16:27 -07:00
parent 8c158aa68f
commit 1f7bf0d6ab
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/splitting/splitting.factor
View File

@ -106,7 +106,12 @@ PRIVATE>
[ pick subseq ] keep swap [ pick subseq ] keep swap
] map 2nip ; ] map 2nip ;
: string-lines ( seq -- seq' ) ! string-lines uses string-nth-fast which is 50% faster over
! nth-unsafe. be careful when changing the definition so that
! you don't unoptimize it.
GENERIC: string-lines ( seq -- seq' )
M: string string-lines
[ V{ } clone 0 ] dip [ 2dup bounds-check? ] [ [ V{ } clone 0 ] dip [ 2dup bounds-check? ] [
2dup [ "\r\n" member? ] find-from swapd [ 2dup [ "\r\n" member? ] find-from swapd [
over [ [ nip length ] keep ] unless over [ [ nip length ] keep ] unless
@ -114,4 +119,6 @@ PRIVATE>
] dip CHAR: \r eq? [ ] dip CHAR: \r eq? [
2dup ?nth CHAR: \n eq? [ [ 1 + ] dip ] when 2dup ?nth CHAR: \n eq? [ [ 1 + ] dip ] when
] when ] when
] while 2drop { } like ; ] while 2drop { } like ;
M: sbuf string-lines "" like string-lines ;