core: Add the shuffler words but without primitives.

[factor.git] / core / hashtables / hashtables.factor

diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor
index d7763428d7c8db2a9eb8bdd31e56879e0dc79680..9cda95da6a20535e8ce7d9146f724acd1721fb49 100644 (file)
--- a/core/hashtables/hashtables.factor
+++ b/core/hashtables/hashtables.factor
@@ -73,7 +73,7 @@ TUPLE: hashtable
         [ pick or [ probe ] dip (new-key@) ]
         if
     ] [
-        [ [ pick ] dip = ] 2dip rot
+        [ pickd = ] 2dip rot
         [ nip [ drop ] 3dip f ]
         [ [ probe ] dip (new-key@) ]
         if
@@ -154,7 +154,7 @@ M: hashtable set-at
 
 : collect-pairs ( hash quot: ( key value -- elt ) -- seq )
     [ [ array>> 0 swap ] [ assoc-size f <array> ] bi ] dip swap [
-        [ [ over ] dip set-nth-unsafe 1 + ] curry compose each-pair
+        [ overd set-nth-unsafe 1 + ] curry compose each-pair
     ] keep nip ; inline
 
 PRIVATE>