Skip to content
Permalink
Browse files

hash-sets: faster grow-hash by not calling members.

  • Loading branch information...
mrjbq7 committed Mar 21, 2013
1 parent e36ba8b commit a75d852a89b9f6ccd93a7f4d329f607e172a8de2
Showing with 10 additions and 7 deletions.
  1. +10 −7 core/hash-sets/hash-sets.factor
@@ -71,12 +71,18 @@ TUPLE: hash-set
[ count>> 3 fixnum*fast 1 fixnum+fast ]
[ array>> length>> 1 fixnum-shift-fast ] bi fixnum> ; inline

: each-member ( array quot: ( elt -- ) -- )
[
[ length ] keep
[ array-nth dup tombstone? [ drop ] ] curry
] dip [ if ] curry compose each-integer ; inline

: grow-hash ( hash -- )
{ hash-set } declare [
[ members { array } declare ]
[ array>> ]
[ cardinality 1 + ]
[ reset-hash ] tri
] keep (rehash) ;
] keep [ (adjoin) ] curry each-member ;

: ?grow-hash ( hash -- )
dup hash-large? [ grow-hash ] [ drop ] if ; inline
@@ -110,11 +116,8 @@ M: hash-set adjoin ( key hash-set -- )
dup ?grow-hash (adjoin) ;

M: hash-set members
[ array>> [ length ] keep ] [ cardinality <vector> ] bi [
[
[ array-nth ] dip over tombstone?
[ 2drop ] [ push-unsafe ] if
] 2curry each-integer
[ array>> ] [ cardinality <vector> ] bi [
[ push-unsafe ] curry each-member
] keep { } like ;

M: hash-set clone

0 comments on commit a75d852

Please sign in to comment.
You can’t perform that action at this time.