sorting.extras: faster map-sort.

diff --git a/extra/sorting/extras/extras.factor b/extra/sorting/extras/extras.factor
index a686b8d9fb74f2febcee0fc464c65e0b3ac786d5..988c73e145d89b15b052a656a63c22d9b3c741e5 100644 (file)
--- a/extra/sorting/extras/extras.factor
+++ b/extra/sorting/extras/extras.factor
@@ -1,4 +1,5 @@
-USING: assocs kernel sequences sequences.private sorting ;
+USING: arrays assocs kernel kernel.private sequences
+sequences.private sorting ;
 IN: sorting.extras
 
 : argsort ( seq quot: ( obj1 obj2 -- <=> ) -- sortedseq )
@@ -7,5 +8,6 @@ IN: sorting.extras
     sort [ second-unsafe ] map! ; inline
 
 : map-sort ( ... seq quot: ( ... elt -- ... key ) -- ... sortedseq )
-    [ map ] curry keep zip [ first-unsafe ] sort-with
-    [ second-unsafe ] map ; inline
+    [ map ] curry keep zip
+    [ { array } declare first-unsafe ] sort-with
+    [ { array } declare second-unsafe ] map ; inline