sequences.abbrev: use assoc-collapse from assocs.extras

diff --git a/extra/sequences/abbrev/abbrev.factor b/extra/sequences/abbrev/abbrev.factor
index 1a74079696f0d9c53de50feb6d885a04dc5ad0c7..abbb31e72ef5c18867f6f420867c450889aeecc3 100644 (file)
--- a/extra/sequences/abbrev/abbrev.factor
+++ b/extra/sequences/abbrev/abbrev.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2009 Maximilian Lupke.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: arrays assocs fry kernel math.ranges sequences ;
+USING: arrays assocs assocs.extras fry kernel math.ranges sequences ;
 IN: sequences.abbrev
 
 <PRIVATE
@@ -11,13 +11,10 @@ IN: sequences.abbrev
 : (abbrev) ( seq -- assoc )
     [ prefixes ] keep 1array '[ _ ] H{ } map>assoc ;
 
-: assoc-merge ( assoc1 assoc2 -- assoc3 )
-    [ '[ over _ at [ append ] when* ] assoc-map ] keep swap assoc-union ;
-
 PRIVATE>
 
 : abbrev ( seqs -- assoc )
-    [ (abbrev) ] map H{ } [ assoc-merge ] reduce ;
+    [ (abbrev) ] map [ append ] assoc-collapse ;
 
 : unique-abbrev ( seqs -- assoc )
     abbrev [ nip length 1 = ] assoc-filter ;