Move unclip-last-slice to sequences
parent
fa1938eda1
commit
255a86c2df
|
@ -670,12 +670,15 @@ PRIVATE>
|
||||||
: unclip ( seq -- rest first )
|
: unclip ( seq -- rest first )
|
||||||
[ rest ] [ first ] bi ;
|
[ rest ] [ first ] bi ;
|
||||||
|
|
||||||
: unclip-last ( seq -- rest last )
|
: unclip-last ( seq -- butfirst last )
|
||||||
[ 1 head* ] [ peek ] bi ;
|
[ 1 head* ] [ peek ] bi ;
|
||||||
|
|
||||||
: unclip-slice ( seq -- rest first )
|
: unclip-slice ( seq -- rest first )
|
||||||
[ rest-slice ] [ first ] bi ;
|
[ rest-slice ] [ first ] bi ;
|
||||||
|
|
||||||
|
: unclip-last-slice ( seq -- butfirst last )
|
||||||
|
[ 1 head-slice* ] [ peek ] bi ;
|
||||||
|
|
||||||
: <flat-slice> ( seq -- slice )
|
: <flat-slice> ( seq -- slice )
|
||||||
dup slice? [ { } like ] when 0 over length rot <slice> ;
|
dup slice? [ { } like ] when 0 over length rot <slice> ;
|
||||||
inline
|
inline
|
||||||
|
|
|
@ -105,9 +105,6 @@ VALUE: grapheme-table
|
||||||
: string-reverse ( str -- rts )
|
: string-reverse ( str -- rts )
|
||||||
>graphemes reverse concat ;
|
>graphemes reverse concat ;
|
||||||
|
|
||||||
: unclip-last-slice ( seq -- beginning last )
|
|
||||||
dup 1 head-slice* swap peek ;
|
|
||||||
|
|
||||||
: last-grapheme ( str -- i )
|
: last-grapheme ( str -- i )
|
||||||
unclip-last-slice grapheme-class swap
|
unclip-last-slice grapheme-class swap
|
||||||
[ grapheme-class dup rot grapheme-break? ] find-last-index ?1+ nip ;
|
[ grapheme-class dup rot grapheme-break? ] find-last-index ?1+ nip ;
|
||||||
|
|
Loading…
Reference in New Issue