jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modify previous commit

Browse source 
Modify previous commit to use data[h].hcode in
proc hash for HashSet and for OrderedSet.
This commit is contained in:
Lolo Iccl 2018-05-05 06:20:44 +09:00 • committed by Andreas Rumpf
commit ee8313da3f
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pure/collections/sets.nim
View file

@ -120,9 +120,11 @@ iterator items*[A](s: HashSet[A]): A =
for h in 0..high(s.data): for h in 0..high(s.data):
if isFilled(s.data[h].hcode): yield s.data[h].key if isFilled(s.data[h].hcode): yield s.data[h].key
proc hash*[A](x: HashSet[A]): Hash = proc hash*[A](s: HashSet[A]): Hash =
## hashing of HashSet ## hashing of HashSet
for item in x: result = result !& hash(item) assert s.isValid, "The set needs to be initialized."
for h in 0..high(s.data):
result = result !& s.data[h].hcode
result = !$result result = !$result
const const
@ -695,9 +697,11 @@ iterator items*[A](s: OrderedSet[A]): A =
forAllOrderedPairs: forAllOrderedPairs:
yield s.data[h].key yield s.data[h].key
proc hash*[A](x: OrderedSet[A]): Hash = proc hash*[A](s: OrderedSet[A]): Hash =
## hashing of OrderedSet ## hashing of OrderedSet
for item in x: result = result !& hash(item) assert s.isValid, "The set needs to be initialized."
forAllOrderedPairs:
result = result !& s.data[h].hcode
result = !$result result = !$result
iterator pairs*[A](s: OrderedSet[A]): tuple[a: int, b: A] = iterator pairs*[A](s: OrderedSet[A]): tuple[a: int, b: A] =