interval-maps: clean up some shuffling

diff --git a/basis/interval-maps/interval-maps.factor b/basis/interval-maps/interval-maps.factor
index 4fd4592ee15cae45e85984fdfd19868bfe97a243..63a5740845ef03117df61006a834c27b2f26a40e 100644 (file)
--- a/basis/interval-maps/interval-maps.factor
+++ b/basis/interval-maps/interval-maps.factor
@@ -43,13 +43,13 @@ PRIVATE>
     >intervals ensure-disjoint interval-map boa ;\r
 \r
 : <interval-set> ( specification -- map )\r
-    [ dup 2array ] map <interval-map> ;\r
+    dup zip <interval-map> ;\r
 \r
 :: coalesce ( alist -- specification )\r
     ! Only works with integer keys, because they're discrete\r
     ! Makes 2array keys\r
     [\r
-        alist sort-keys unclip first2 dupd roll\r
+        alist sort-keys unclip swap [ [ first dup ] [ second ] bi ] dip\r
         [| oldkey oldval key val | ! Underneath is start\r
             oldkey 1+ key =\r
             oldval val = and\r