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

hashtables: cleanup duplicate code.

db4
John Benediktsson 2013-04-06 21:36:39 -07:00
parent a58c8ecc03
commit e3ea3ac140
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/hashtables/hashtables.factor
View File

@ -155,22 +155,18 @@ M: hashtable set-at
[ [ 1 fixnum+fast { array-capacity } declare ] dip length<< ] [ [ 1 fixnum+fast { array-capacity } declare ] dip length<< ]
2bi ; inline 2bi ; inline
: collect-pairs ( hash quot: ( key value -- elt ) -- seq )
[ [ array>> ] [ assoc-size <vector> ] bi ] dip swap [
[ push-unsafe ] curry compose each-pair
] keep { } like ; inline
PRIVATE> PRIVATE>
M: hashtable >alist M: hashtable >alist [ 2array ] collect-pairs ;
[ array>> ] [ assoc-size <vector> ] bi [
[ [ 2array ] dip push-unsafe ] curry each-pair
] keep { } like ;
M: hashtable keys M: hashtable keys [ drop ] collect-pairs ;
[ array>> ] [ assoc-size <vector> ] bi [
[ nip push-unsafe ] curry each-pair
] keep { } like ;
M: hashtable values M: hashtable values [ nip ] collect-pairs ;
[ array>> ] [ assoc-size <vector> ] bi [
[ [ drop ] 2dip push-unsafe ] curry each-pair
] keep { } like ;
M: hashtable clone M: hashtable clone
(clone) [ clone ] change-array ; inline (clone) [ clone ] change-array ; inline