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

Cleanup

db4
Slava Pestov 2008-03-29 20:28:07 -05:00
parent d7742af90e
commit db7939d68c
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/hashtables/hashtables.factor
View File

@ -18,14 +18,9 @@ IN: hashtables
: (key@) ( key keys i -- array n ? ) : (key@) ( key keys i -- array n ? )
3dup swap array-nth 3dup swap array-nth
dup ((empty)) eq? dup ((empty)) eq?
[ 3drop nip f f ] [ 3drop nip f f ] [
[ = [ rot drop t ] [ probe (key@) ] if
= ] if ; inline
[ rot drop t ]
[ probe (key@) ]
if
]
if ; inline
: key@ ( key hash -- array n ? ) : key@ ( key hash -- array n ? )
hash-array 2dup hash@ (key@) ; inline hash-array 2dup hash@ (key@) ; inline
@ -89,7 +84,8 @@ IN: hashtables
] if ] if
] if ; inline ] if ; inline
: find-pair ( array quot -- key value ? ) 0 rot (find-pair) ; inline : find-pair ( array quot -- key value ? )
0 rot (find-pair) ; inline
: (rehash) ( hash array -- ) : (rehash) ( hash array -- )
[ swap pick (set-hash) drop f ] find-pair 2drop 2drop ; [ swap pick (set-hash) drop f ] find-pair 2drop 2drop ;
@ -99,8 +95,7 @@ IN: hashtables
[ hash-array array-capacity ] bi > ; [ hash-array array-capacity ] bi > ;
: hash-stale? ( hash -- ? ) : hash-stale? ( hash -- ? )
[ hash-deleted 10 fixnum*fast ] [ hash-deleted 10 fixnum*fast ] [ hash-count ] bi fixnum> ;
[ hash-count ] bi fixnum> ;
: grow-hash ( hash -- ) : grow-hash ( hash -- )
[ dup hash-array swap assoc-size 1+ ] keep [ dup hash-array swap assoc-size 1+ ] keep