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

modern.slices: rename a few words'

locals-and-roots
Doug Coleman 2016-06-23 16:42:26 -07:00
parent 1f373cd251
commit 818c0b69d3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/modern/slices/slices.factor
View File

@ -66,14 +66,14 @@ ERROR: unexpected-end n string ;
n n' string ?<slice> n n' string ?<slice>
ch ; inline ch ; inline
:: slice-until' ( n string quot -- n' string slice/f ch/f ) :: (slice-until) ( n string quot -- n' string slice/f ch/f )
n string quot find-from :> ( n' ch ) n string quot find-from :> ( n' ch )
n' string n' string
n n' string ?<slice> n n' string ?<slice>
ch ; inline ch ; inline
: slice-until ( n string quot -- n' string slice/f ) : slice-until ( n string quot -- n' string slice/f )
slice-until' drop ; inline (slice-until) drop ; inline
:: slice-til-not-whitespace ( n string -- n' string slice/f ch/f ) :: slice-til-not-whitespace ( n string -- n' string slice/f ch/f )
n string [ "\s\r\n" member? not ] find-from :> ( n' ch ) n string [ "\s\r\n" member? not ] find-from :> ( n' ch )
@ -100,7 +100,7 @@ ERROR: unexpected-end n string ;
n string string empty-slice-end f n string string empty-slice-end f
] if ; inline ] if ; inline
:: merge-slice-til-eol-slash'' ( n string -- n' string slice/f ch/f ) :: ((merge-slice-til-eol-slash)) ( n string -- n' string slice/f ch/f )
n [ n [
n string '[ "\r\n\\" member? ] find-from :> ( n' ch ) n string '[ "\r\n\\" member? ] find-from :> ( n' ch )
n' string n' string
@ -128,11 +128,11 @@ ERROR: unexpected-end n string ;
: ?nth' ( n/f string/f -- obj/f ) : ?nth' ( n/f string/f -- obj/f )
over [ ?nth ] [ 2drop f ] if ; over [ ?nth ] [ 2drop f ] if ;
:: merge-slice-til-eol-slash' ( n string slice -- n' string slice/f ch/f ) :: (merge-slice-til-eol-slash) ( n string slice -- n' string slice/f ch/f )
n string merge-slice-til-eol-slash'' :> ( n' string' slice' ch' ) n string ((merge-slice-til-eol-slash)) :> ( n' string' slice' ch' )
ch' char: \ = [ ch' char: \ = [
n' 1 + string' ?nth' "\r\n" member? [ n' 1 + string' ?nth' "\r\n" member? [
n' 2 + string' slice slice' span-slices merge-slice-til-eol-slash' n' 2 + string' slice slice' span-slices (merge-slice-til-eol-slash)
] [ ] [
"omg" throw "omg" throw
] if ] if
@ -142,7 +142,7 @@ ERROR: unexpected-end n string ;
! Supports \ at eol (with no space after it) ! Supports \ at eol (with no space after it)
: slice-til-eol-slash ( n string -- n' string slice/f ch/f ) : slice-til-eol-slash ( n string -- n' string slice/f ch/f )
2dup empty-slice-from merge-slice-til-eol-slash' ; 2dup empty-slice-from (merge-slice-til-eol-slash) ;
:: slice-til-separator-inclusive ( n string tokens -- n' string slice/f ch/f ) :: slice-til-separator-inclusive ( n string tokens -- n' string slice/f ch/f )
n string '[ tokens member? ] find-from [ dup [ 1 + ] when ] dip :> ( n' ch ) n string '[ tokens member? ] find-from [ dup [ 1 + ] when ] dip :> ( n' ch )