assocs: Add assoc-union-as. Use assoc-reject-like.

diff --git a/basis/core-foundation/fsevents/fsevents.factor b/basis/core-foundation/fsevents/fsevents.factor
index b5dc9685594bdfbf7737d0abe17c494cc39523e5..3bffbbaec17f838b34bdbad81e2b29c2ef829baa 100644 (file)
--- a/basis/core-foundation/fsevents/fsevents.factor
+++ b/basis/core-foundation/fsevents/fsevents.factor
@@ -169,7 +169,7 @@ SYMBOL: event-stream-callbacks
 
 [
     event-stream-callbacks
-    [ [ drop expired? ] assoc-reject H{ } assoc-like ] change-global
+    [ [ drop expired? ] H{ } assoc-reject-as ] change-global
 ] "core-foundation" add-startup-hook
 
 : add-event-source-callback ( quot -- id )

diff --git a/core/assocs/assocs.factor b/core/assocs/assocs.factor
index 9e82bc817b17778aeb2654bb3d38619e547a65fb..68cf697a09496f83c8ec9c688f7ae65e16143f53 100644 (file)
--- a/core/assocs/assocs.factor
+++ b/core/assocs/assocs.factor
@@ -155,10 +155,13 @@ M: assoc values [ nip ] { } assoc>map ;
 : assoc-union! ( assoc1 assoc2 -- assoc1 )
     over [ set-at ] with-assoc assoc-each ;
 
-: assoc-union ( assoc1 assoc2 -- union )
-    [ [ [ assoc-size ] bi@ + ] [ drop ] 2bi new-assoc ] 2keep
+: assoc-union-as ( assoc1 assoc2 exemplar -- union )
+    [ [ [ assoc-size ] bi@ + ] dip new-assoc ] 3keep drop
     [ assoc-union! ] bi@ ;
 
+: assoc-union ( assoc1 assoc2 -- union )
+    over assoc-union-as ;
+
 : assoc-combine ( seq -- union )
     H{ } clone [ assoc-union! ] reduce ;