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

WIP 4

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2020-02-13 08:02:20 -07:00
commit ae108f7a56
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/collections/hashcommon.nim
View file

@ -52,7 +52,7 @@ proc rawGetKnownHC[X, A](t: X, key: A, hc: Hash): int {.inline.} =
rawGetKnownHCImpl()
template genHashImpl(key, hc: typed) =
hc = hash(key, targetBits=lastSetBit(maxHash(t)))
hc = hash(key, targetBits=lastSetBit(maxHash(t).uint))
if hc == 0: # This almost never taken branch should be very predictable.
hc = 314159265 # Value doesn't matter; Any non-zero favorite is fine.

14
lib/pure/hashes.nim
View file

@ -117,11 +117,11 @@ const
defaultSeedB = (1734880652122947187'u64).uint
template computeIntegerHash(x, numBits, seedA, seedB): Hash =
cast[Hash]((seedA*cast[uint](x) + seedB) shr (sizeof(x)*8 - targetBits*8))
cast[Hash]((seedA*cast[uint](x) + seedB) shr (sizeof(x)*8 - numBits*8))
proc hash*(
x: int,
targetBits = sizeof(uint).uint32,
targetBits: SomeUnsignedInt = sizeof(uint),
seedA = defaultSeedA,
seedB = defaultSeedB
): Hash {.inline.} =
@ -130,7 +130,7 @@ proc hash*(
proc hash*(
x: int64,
targetBits = sizeof(uint).uint32,
targetBits: SomeUnsignedInt = sizeof(uint),
seedA = defaultSeedA,
seedB = defaultSeedB
): Hash {.inline.} =
@ -139,7 +139,7 @@ proc hash*(
proc hash*(
x: uint,
targetBits = sizeof(uint).uint32,
targetBits: SomeUnsignedInt = sizeof(uint),
seedA = defaultSeedA,
seedB = defaultSeedB
): Hash {.inline.} =
@ -148,7 +148,7 @@ proc hash*(
proc hash*(
x: uint64,
targetBits = sizeof(uint).uint32,
targetBits: SomeUnsignedInt = sizeof(uint),
seedA = defaultSeedA,
seedB = defaultSeedB
): Hash {.inline.} =
@ -157,7 +157,7 @@ proc hash*(
proc hash*(
x: char,
targetBits = sizeof(uint).uint32,
targetBits: SomeUnsignedInt = sizeof(uint),
seedA = defaultSeedA,
seedB = defaultSeedB
): Hash {.inline.} =
@ -166,7 +166,7 @@ proc hash*(
proc hash*[T: Ordinal](
x: T,
targetBits = sizeof(uint).uint32,
targetBits: SomeUnsignedInt = sizeof(uint),
seedA = defaultSeedA,
seedB = defaultSeedB
): Hash {.inline.} =