mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-24 00:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4367 from kierdavis/4365-tables-clear

Browse Source 
Improvements to tables.clear()
This commit is contained in:
Andreas Rumpf
2016-08-25 16:46:53 +02:00
committed by GitHub
parent 9c33a5f0b1 8e843354e1
commit 1e134aed49
4 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pure/collections/tableimpl.nim
View File

@@ -142,7 +142,8 @@ template delImpl() {.dirty.} =
template clearImpl() {.dirty.} =
for i in 0 .. <t.data.len:
t.data[i].hcode = 0
when compiles(t.data[i].hcode): # CountTable records don't contain a hcode
t.data[i].hcode = 0
t.data[i].key = default(type(t.data[i].key))
t.data[i].val = default(type(t.data[i].val))
t.counter = 0

6
lib/pure/collections/tables.nim
View File

@@ -118,7 +118,7 @@ template dataLen(t): untyped = len(t.data)
include tableimpl
proc clear*[A, B](t: Table[A, B] | TableRef[A, B]) =
proc clear*[A, B](t: var Table[A, B] | TableRef[A, B]) =
## Resets the table so that it is empty.
clearImpl()
@@ -457,7 +457,7 @@ proc len*[A, B](t: OrderedTable[A, B]): int {.inline.} =
## returns the number of keys in `t`.
result = t.counter
proc clear*[A, B](t: OrderedTable[A, B] | OrderedTableRef[A, B]) =
proc clear*[A, B](t: var OrderedTable[A, B] | OrderedTableRef[A, B]) =
## Resets the table so that it is empty.
clearImpl()
t.first = -1
@@ -786,7 +786,7 @@ proc len*[A](t: CountTable[A]): int =
## returns the number of keys in `t`.
result = t.counter
proc clear*[A](t: CountTable[A] | CountTableRef[A]) =
proc clear*[A](t: var CountTable[A] | CountTableRef[A]) =
## Resets the table so that it is empty.
clearImpl()
t.counter = 0