X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=extra%2Fassocs%2Fextras%2Fextras.factor;h=7073a074382ca3ed6fa105dcb0466d9b8327c444;hp=77f8d991023d17f4f620cb098d48a1414fc1dd87;hb=baa7f3b31f3686dd30a70a3a32566c3097068e5d;hpb=8d6a9d73acbca166c246a407a33c637b5d0ffb77

diff --git a/extra/assocs/extras/extras.factor b/extra/assocs/extras/extras.factor
index 77f8d99102..7073a07438 100644
--- a/extra/assocs/extras/extras.factor
+++ b/extra/assocs/extras/extras.factor
@@ -7,7 +7,7 @@ IN: assocs.extras
 : push-at-each ( value keys assoc -- )
     '[ _ push-at ] with each ; inline
 
-: deep-at ( assoc seq -- value/f )
+: deep-of ( assoc seq -- value/f )
     [ of ] each ; inline
 
 : substitute! ( seq assoc -- seq )
@@ -217,8 +217,11 @@ PRIVATE>
 : flatten-values ( assoc -- assoc' )
     dup any-multi-value? [ expand-values-set-at flatten-values ] when ;
 
+: intersect-keys-as ( assoc seq exemplar -- elts )
+  [ [ of ] with ] dip zip-with-as sift-values ; inline
+
 : intersect-keys ( assoc seq -- elts )
-    [ of ] with zip-with sift-values ; inline
+    over intersect-keys-as ; inline
 
 : values-of ( assoc seq -- seq' )
     [ of ] with map ; inline
@@ -245,33 +248,35 @@ PRIVATE>
 : collect-assoc-by ( ... input-assoc quot: ( ... key value -- ... key value ) -- ... assoc )
     [ H{ } clone ] 2dip collect-assoc-by! ; inline
 
-: collect-key-by! ( ... assoc input-assoc quot: ( ... key -- ... new-key ) -- ... assoc )
-    rot [ '[ drop _ keep swap _ push-at ] assoc-each ] keep ; inline
+: collect-key-by! ( ... assoc input-assoc quot: ( ... key value -- ... new-key ) -- ... assoc )
+    '[ _ keepd ] collect-assoc-by! ; inline
 
-: collect-key-by ( ... input-assoc quot: ( ... key -- ... new-key ) -- ... assoc )
+: collect-key-by ( ... input-assoc quot: ( ... key value -- ... new-key ) -- ... assoc )
     [ H{ } clone ] 2dip collect-key-by! ; inline
 
-: collect-value-by! ( ... assoc input-assoc quot: ( ... value -- ... new-key ) -- ... assoc )
-    rot [ '[ nip _ keep swap _ push-at ] assoc-each ] keep ; inline
+: collect-value-by! ( ... assoc input-assoc quot: ( ... key value -- ... new-key ) -- ... assoc )
+    '[ _ keep ] collect-assoc-by! ; inline
 
-: collect-value-by ( ... input-assoc quot: ( ... value -- ... new-key ) -- ... assoc )
+: collect-value-by ( ... input-assoc quot: ( ... key value -- ... new-key ) -- ... assoc )
     [ H{ } clone ] 2dip collect-value-by! ; inline
 
 
 : collect-assoc-by-multi! ( ... assoc input-assoc quot: ( ... key value -- ... new-keys value' ) -- ... assoc )
-    rot [ '[ @ swap _ B push-at-each ] assoc-each ] keep ; inline
+    rot [ '[ @ swap _ push-at-each ] assoc-each ] keep ; inline
 
 : collect-assoc-by-multi ( ... assoc quot: ( ... key value -- ... new-keys value' ) -- ... assoc )
     [ H{ } clone ] 2dip collect-assoc-by-multi! ; inline
 
-: collect-key-by-multi! ( ... assoc input-assoc quot: ( ... key -- ... new-keys ) -- ... assoc )
-    rot [ '[ drop _ keep swap _ push-at-each ] assoc-each ] keep ; inline
+
+: collect-key-by-multi! ( ... assoc input-assoc quot: ( ... key value -- ... new-keys ) -- ... assoc )
+    '[ _ keepd ] collect-assoc-by-multi! ; inline
 
 : collect-key-by-multi ( ... assoc quot: ( ... key -- ... new-keys ) -- ... assoc )
     [ H{ } clone ] 2dip collect-key-by-multi! ; inline
 
-: collect-value-by-multi! ( ... assoc input-assoc quot: ( ... value -- ... new-keys ) -- ... assoc )
-    rot [ '[ nip _ keep swap _ push-at-each ] assoc-each ] keep ; inline
+
+: collect-value-by-multi! ( ... assoc input-assoc quot: ( ... key value -- ... new-keys ) -- ... assoc )
+    '[ _ keep ] collect-assoc-by-multi! ; inline
 
 : collect-value-by-multi ( ... assoc quot: ( ... value -- ... new-keys ) -- ... assoc )
     [ H{ } clone ] 2dip collect-value-by-multi! ; inline