factor: trim using lists

[factor.git] / basis / sorting / human / human.factor

diff --git a/basis/sorting/human/human.factor b/basis/sorting/human/human.factor
index a6eaf52bd49b660fadd4a5b3daa17e99923ee88c..9e311ca03ac2500705453b84b93f829f42605e77 100644 (file)
--- a/basis/sorting/human/human.factor
+++ b/basis/sorting/human/human.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008, 2010 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors fry kernel make math math.order math.parser
+USING: accessors kernel make math math.order math.parser
 sequences sorting.functor strings unicode ;
 IN: sorting.human
 
@@ -32,7 +32,7 @@ TUPLE: alphanum obj ;
 
 : <alphanum-insensitive> ( obj -- alphanum )
     alphanum new
-        swap dup string? [ w/collation-key ] when >>obj ; inline
+        swap dup string? [ collation-key/nfd drop ] when >>obj ; inline
 
 M: alphanum <=>
     [ obj>> ] bi@