interval-maps: first2 is faster.

diff --git a/basis/interval-maps/interval-maps.factor b/basis/interval-maps/interval-maps.factor
index d408c6b5bb54d0dfa525f331c3c3f67ced6ec33b..36b34647859c9479773c8643c560097eb89873b0 100644 (file)
--- a/basis/interval-maps/interval-maps.factor
+++ b/basis/interval-maps/interval-maps.factor
@@ -16,7 +16,7 @@ ALIAS: value third
     array>> [ start <=> ] with search nip ;\r
 \r
 : interval-contains? ( key interval-node -- ? )\r
-    [ start ] [ end ] bi between? ;\r
+    first2 between? ;\r
 \r
 : all-intervals ( sequence -- intervals )\r
     [ [ dup number? [ dup 2array ] when ] dip ] { } assoc-map-as ;\r
@@ -56,7 +56,7 @@ PRIVATE>
     ! Only works with integer keys, because they're discrete\r
     ! Makes 2array keys\r
     [\r
-        alist sort-keys unclip swap [ [ first dup ] [ second ] bi ] dip\r
+        alist sort-keys unclip swap [ first2 dupd ] dip\r
         [| oldkey oldval key val | ! Underneath is start\r
             oldkey 1 + key =\r
             oldval val = and\r