assocs: Make map-index-as support seq or assoc exemplars and move map-index, map...

[factor.git] / basis / shuffle / shuffle.factor

diff --git a/basis/shuffle/shuffle.factor b/basis/shuffle/shuffle.factor
index 7903924361b906d4a25c77c0dfca8dcdcf6819f0..769576bb039fb73e16a2ea2ef1f06fbad91600bf 100644 (file)
--- a/basis/shuffle/shuffle.factor
+++ b/basis/shuffle/shuffle.factor
@@ -5,15 +5,8 @@ generalizations sequences.generalizations hashtables kernel
 locals locals.backend macros make math parser sequences ;
 IN: shuffle
 
-<PRIVATE
-
-: >index-assoc ( sequence -- assoc )
-    zip-index >hashtable ;
-
-PRIVATE>
-
 MACRO: shuffle-effect ( effect -- )
-    [ out>> ] [ in>> >index-assoc ] bi
+    [ out>> ] [ in>> H{ } zip-index-as ] bi
     [
         [ nip assoc-size , \ narray , ]
         [ [ at \ swap \ nth [ ] 3sequence ] curry map , \ cleave , ] 2bi