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

bitsets.nim: cleanup (#19361)

Browse source
This commit is contained in:
Andreas Rumpf 2022-01-11 10:16:51 +01:00 • committed by GitHub
commit 9888a29c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

35
compiler/bitsets.nim
View file

@ -23,53 +23,40 @@ const
template modElemSize(arg: untyped): untyped = arg and 7 template modElemSize(arg: untyped): untyped = arg and 7
template divElemSize(arg: untyped): untyped = arg shr 3 template divElemSize(arg: untyped): untyped = arg shr 3
proc bitSetInit*(b: var TBitSet, length: int) proc bitSetIn*(x: TBitSet, e: BiggestInt): bool =
proc bitSetUnion*(x: var TBitSet, y: TBitSet)
proc bitSetDiff*(x: var TBitSet, y: TBitSet)
proc bitSetSymDiff*(x: var TBitSet, y: TBitSet)
proc bitSetIntersect*(x: var TBitSet, y: TBitSet)
proc bitSetIncl*(x: var TBitSet, elem: BiggestInt)
proc bitSetExcl*(x: var TBitSet, elem: BiggestInt)
proc bitSetIn*(x: TBitSet, e: BiggestInt): bool
proc bitSetEquals*(x, y: TBitSet): bool
proc bitSetContains*(x, y: TBitSet): bool
proc bitSetCard*(x: TBitSet): BiggestInt
# implementation
proc bitSetIn(x: TBitSet, e: BiggestInt): bool =
result = (x[int(e.divElemSize)] and (One shl e.modElemSize)) != Zero result = (x[int(e.divElemSize)] and (One shl e.modElemSize)) != Zero
proc bitSetIncl(x: var TBitSet, elem: BiggestInt) = proc bitSetIncl*(x: var TBitSet, elem: BiggestInt) =
assert(elem >= 0) assert(elem >= 0)
x[int(elem.divElemSize)] = x[int(elem.divElemSize)] or x[int(elem.divElemSize)] = x[int(elem.divElemSize)] or
(One shl elem.modElemSize) (One shl elem.modElemSize)
proc bitSetExcl(x: var TBitSet, elem: BiggestInt) = proc bitSetExcl*(x: var TBitSet, elem: BiggestInt) =
x[int(elem.divElemSize)] = x[int(elem.divElemSize)] and x[int(elem.divElemSize)] = x[int(elem.divElemSize)] and
not(One shl elem.modElemSize) not(One shl elem.modElemSize)
proc bitSetInit(b: var TBitSet, length: int) = proc bitSetInit*(b: var TBitSet, length: int) =
newSeq(b, length) newSeq(b, length)
proc bitSetUnion(x: var TBitSet, y: TBitSet) = proc bitSetUnion*(x: var TBitSet, y: TBitSet) =
for i in 0..high(x): x[i] = x[i] or y[i] for i in 0..high(x): x[i] = x[i] or y[i]
proc bitSetDiff(x: var TBitSet, y: TBitSet) = proc bitSetDiff*(x: var TBitSet, y: TBitSet) =
for i in 0..high(x): x[i] = x[i] and not y[i] for i in 0..high(x): x[i] = x[i] and not y[i]
proc bitSetSymDiff(x: var TBitSet, y: TBitSet) = proc bitSetSymDiff*(x: var TBitSet, y: TBitSet) =
for i in 0..high(x): x[i] = x[i] xor y[i] for i in 0..high(x): x[i] = x[i] xor y[i]
proc bitSetIntersect(x: var TBitSet, y: TBitSet) = proc bitSetIntersect*(x: var TBitSet, y: TBitSet) =
for i in 0..high(x): x[i] = x[i] and y[i] for i in 0..high(x): x[i] = x[i] and y[i]
proc bitSetEquals(x, y: TBitSet): bool = proc bitSetEquals*(x, y: TBitSet): bool =
for i in 0..high(x): for i in 0..high(x):
if x[i] != y[i]: if x[i] != y[i]:
return false return false
result = true result = true
proc bitSetContains(x, y: TBitSet): bool = proc bitSetContains*(x, y: TBitSet): bool =
for i in 0..high(x): for i in 0..high(x):
if (x[i] and not y[i]) != Zero: if (x[i] and not y[i]) != Zero:
return false return false
@ -96,6 +83,6 @@ const populationCount: array[uint8, uint8] = block:
arr arr
proc bitSetCard(x: TBitSet): BiggestInt = proc bitSetCard*(x: TBitSet): BiggestInt =
for it in x: for it in x:
result.inc int(populationCount[it]) result.inc int(populationCount[it])