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

Collation cleanup and test added

db4
Daniel Ehrenberg 2008-06-01 13:50:12 -05:00
parent a2ee33f282
commit 94776f6841
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extra/unicode/collation/collation-tests.factor
View File

@ -24,6 +24,9 @@ IN: unicode.collation.tests
[ t t f f ] [ "hello" "HELLO" test-equality ] unit-test [ t t f f ] [ "hello" "HELLO" test-equality ] unit-test
[ t t t f ] [ "hello" "h e l l o." test-equality ] unit-test [ t t t f ] [ "hello" "h e l l o." test-equality ] unit-test
[ t t t t ] [ "hello" "\0hello\0" test-equality ] unit-test [ t t t t ] [ "hello" "\0hello\0" test-equality ] unit-test
[ { "good bye" "goodbye" "hello" "HELLO" } ]
[ { "HELLO" "goodbye" "good bye" "hello" } sort-strings ]
unit-test
parse-test 2 <clumps> parse-test 2 <clumps>
[ [ test-two ] assoc-each ] with-null-writer [ [ test-two ] assoc-each ] with-null-writer

11
extra/unicode/collation/collation.factor
View File

@ -154,18 +154,13 @@ PRIVATE>
0 insensitive= ; 0 insensitive= ;
<PRIVATE <PRIVATE
: compare-collation ( {str1,key} {str2,key} -- <=> )
2dup [ second ] bi@ <=> dup +eq+ =
[ drop <=> ] [ 2nip ] if ;
: w/collation-key ( str -- {str,key} ) : w/collation-key ( str -- {str,key} )
dup collation-key 2array ; [ collation-key ] keep 2array ;
PRIVATE> PRIVATE>
: sort-strings ( strings -- sorted ) : sort-strings ( strings -- sorted )
[ w/collation-key ] map [ w/collation-key ] map
[ compare-collation ] sort natural-sort values ;
keys ;
: string<=> ( str1 str2 -- <=> ) : string<=> ( str1 str2 -- <=> )
[ w/collation-key ] bi@ compare-collation ; [ w/collation-key ] compare ;