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

hashtables: slightly faster associate and collect-pairs.

db4
John Benediktsson 2014-02-06 22:39:43 -08:00
parent aeed8b51d4
commit fb9c5f9aee
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/hashtables/hashtables.factor
View File

@ -97,7 +97,7 @@ TUPLE: hashtable
[ count>> 3 fixnum*fast ] [ count>> 3 fixnum*fast ]
[ array>> length>> ] bi fixnum>= ; inline [ array>> length>> ] bi fixnum>= ; inline
: each-pair ( array quot: ( key value -- ) -- ) : each-pair ( ... array quot: ( ... key value -- ... ) -- ... )
[ [
[ length 2/ ] keep [ [ length 2/ ] keep [
[ 1 fixnum-shift-fast ] dip [ array-nth ] 2keep [ 1 fixnum-shift-fast ] dip [ array-nth ] 2keep
@ -145,20 +145,16 @@ M: hashtable set-at
dup ?grow-hash (set-at) ; dup ?grow-hash (set-at) ;
: associate ( value key -- hash ) : associate ( value key -- hash )
1 <hashtable> [ set-at ] keep ; inline [ 1 0 ] 2dip 1 <hash-array>
[ 2dup hash@ set-nth-pair ] keep
hashtable boa ; inline
<PRIVATE <PRIVATE
: push-unsafe ( elt seq -- )
[ length ] keep
[ underlying>> set-array-nth ]
[ [ 1 fixnum+fast { array-capacity } declare ] dip length<< ]
2bi ; inline
: collect-pairs ( hash quot: ( key value -- elt ) -- seq ) : collect-pairs ( hash quot: ( key value -- elt ) -- seq )
[ [ array>> ] [ assoc-size <vector> ] bi ] dip swap [ [ [ array>> 0 swap ] [ assoc-size f <array> ] bi ] dip swap [
[ push-unsafe ] curry compose each-pair [ [ over ] dip set-nth-unsafe 1 + ] curry compose each-pair
] keep { } like ; inline ] keep nip ; inline
PRIVATE> PRIVATE>