steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

assocs.extras: minor changes to assoc-merge.

db4
John Benediktsson 2015-06-03 08:59:41 -07:00
parent 14ed9a5455
commit fbc146d97a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extra/assocs/extras/extras-tests.factor
View File

@ -1,5 +1,5 @@
USING: assocs.extras kernel tools.test ;
USING: assocs.extras kernel sequences tools.test ;
IN: assocs.extras
@ -12,11 +12,10 @@ IN: assocs.extras
{ H{ { 2 1 } { 4 3 } } } [ H{ { 1 2 } { 3 4 } } assoc-invert ] unit-test
[ H{ } ] [ { } assoc-merge ] unit-test
[ H{ { "a" V{ 2 5 } } { "b" V{ 3 } } { "c" V{ 10 } } } ]
[
{ H{ { "a" 2 } { "b" 3 } } H{ { "a" 5 } { "c" 10 } } }
assoc-merge
[ ] [ assoc-merge ] map-reduce
] unit-test
{ H{ } } [ H{ { 1 2 } } 2 over delete-value-at ] unit-test

7
extra/assocs/extras/extras.factor
View File

@ -39,11 +39,12 @@ IN: assocs.extras
: assoc-invert ( assoc -- newassoc )
dup assoc-invert-as ;
: (assoc-merge) ( assoc1 assoc2 -- assoc1 )
: assoc-merge! ( assoc1 assoc2 -- assoc1 )
over [ push-at ] with-assoc assoc-each ;
: assoc-merge ( seq -- merge )
H{ } clone [ (assoc-merge) ] reduce ;
: assoc-merge ( assoc1 assoc2 -- newassoc )
[ [ [ assoc-size ] bi@ + ] [ drop ] 2bi new-assoc ] 2keep
[ assoc-merge! ] bi@ ;
GENERIC: delete-value-at ( value assoc -- )