hashtables: cleanup duplicate code.

diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor
index 420d525e59ff9a3005df23ffd57ee1a43e92a7fa..5327d122d7bfcefb9a78bb712c2b16ed96231e29 100644 (file)
--- a/core/hashtables/hashtables.factor
+++ b/core/hashtables/hashtables.factor
@@ -155,22 +155,18 @@ M: hashtable set-at
     [ [ 1 fixnum+fast { array-capacity } declare ] dip length<< ]
     2bi ; inline
 
+: collect-pairs ( hash quot: ( key value -- elt ) -- seq )
+    [ [ array>> ] [ assoc-size <vector> ] bi ] dip swap [
+        [ push-unsafe ] curry compose each-pair
+    ] keep { } like ; inline
+
 PRIVATE>
 
-M: hashtable >alist
-    [ array>> ] [ assoc-size <vector> ] bi [
-        [ [ 2array ] dip push-unsafe ] curry each-pair
-    ] keep { } like ;
+M: hashtable >alist [ 2array ] collect-pairs ;
 
-M: hashtable keys
-    [ array>> ] [ assoc-size <vector> ] bi [
-        [ nip push-unsafe ] curry each-pair
-    ] keep { } like ;
+M: hashtable keys [ drop ] collect-pairs ;
 
-M: hashtable values
-    [ array>> ] [ assoc-size <vector> ] bi [
-        [ [ drop ] 2dip push-unsafe ] curry each-pair
-    ] keep { } like ;
+M: hashtable values [ nip ] collect-pairs ;
 
 M: hashtable clone
     (clone) [ clone ] change-array ; inline