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

bugfix: collection/sets only worked by chance ...

Browse source
This commit is contained in:
Araq 2012-07-25 23:18:47 +02:00
commit 05a66a6a68
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ proc RawGet[A](s: TSet[A], key: A): int =
proc contains*[A](s: TSet[A], key: A): bool = proc contains*[A](s: TSet[A], key: A): bool =
## returns true iff `key` is in `s`. ## returns true iff `key` is in `s`.
var index = RawGet(t, key) var index = RawGet(s, key)
result = index >= 0 result = index >= 0
proc RawInsert[A](s: var TSet[A], data: var TKeyValuePairSeq[A], key: A) = proc RawInsert[A](s: var TSet[A], data: var TKeyValuePairSeq[A], key: A) =
@ -103,7 +103,7 @@ proc incl*[A](s: var TSet[A], key: A) =
proc excl*[A](s: var TSet[A], key: A) = proc excl*[A](s: var TSet[A], key: A) =
## excludes `key` from the set `s`. ## excludes `key` from the set `s`.
var index = RawGet(t, key) var index = RawGet(s, key)
if index >= 0: if index >= 0:
s.data[index].slot = seDeleted s.data[index].slot = seDeleted
dec(s.counter) dec(s.counter)
@ -149,11 +149,11 @@ type
proc len*[A](s: TOrderedSet[A]): int {.inline.} = proc len*[A](s: TOrderedSet[A]): int {.inline.} =
## returns the number of keys in `s`. ## returns the number of keys in `s`.
result = t.counter result = s.counter
proc card*[A](s: TOrderedSet[A]): int {.inline.} = proc card*[A](s: TOrderedSet[A]): int {.inline.} =
## alias for `len`. ## alias for `len`.
result = t.counter result = s.counter
template forAllOrderedPairs(yieldStmt: stmt) = template forAllOrderedPairs(yieldStmt: stmt) =
var h = s.first var h = s.first