diff --git a/basis/sorting/human/human.factor b/basis/sorting/human/human.factor index a839958b5e..8f3b47dc3d 100644 --- a/basis/sorting/human/human.factor +++ b/basis/sorting/human/human.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors fry kernel make math math.order math.parser sequences sorting.functor strings unicode.case -unicode.categories ; +unicode.categories unicode.collation ; IN: sorting.human : cut-find ( seq pred -- before after ) @@ -33,7 +33,7 @@ TUPLE: hybrid obj ; : ( obj -- hybrid ) hybrid new - swap dup string? [ >case-fold ] when >>obj ; inline + swap dup string? [ w/collation-key ] when >>obj ; inline M: hybrid <=> [ obj>> ] bi@ diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor index dc3cd89b51..2c29de3f28 100644 --- a/basis/unicode/collation/collation.factor +++ b/basis/unicode/collation/collation.factor @@ -149,10 +149,8 @@ PRIVATE> : quaternary= ( str1 str2 -- ? ) 0 insensitive= ; - : sort-strings ( strings -- sorted ) [ w/collation-key ] map natural-sort values ;