assocs: faster map>assoc.

diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor
index c48a3bc4358b8474dc9921b0f26b237db4c5630f..d59b2534ab936e660668c0505bc97026f80df3bf 100644 (file)
--- a/core/assocs/assocs.factor
+++ b/core/assocs/assocs.factor
@@ -167,7 +167,12 @@ M: assoc assoc-clone-like ( assoc exemplar -- newassoc )
 : inc-at ( key assoc -- ) [ 1 ] 2dip at+ ; inline
 
 : map>assoc ( ... seq quot: ( ... elt -- ... key value ) exemplar -- ... assoc )
-    [ [ 2array ] compose { } map-as ] dip assoc-like ; inline
+    dup sequence? [
+        [ [ 2array ] compose ] dip map-as
+    ] [
+        [ over assoc-size ] dip new-assoc
+        [ [ swapd set-at ] curry compose each ] keep
+    ] if ; inline
 
 : extract-keys ( seq assoc -- subassoc )
     [ [ dupd at ] curry ] keep map>assoc ;