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

Merge pull request #3703 from singularperturbation/feature/counttableref_getordefault

Browse source 
Fix CountTableRef#getOrDefault (#3702)
This commit is contained in:
Andreas Rumpf 2016-01-18 14:30:14 +01:00
commit b0aaeaa436
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pure/collections/tables.nim
View file

@ -887,7 +887,7 @@ proc mget*[A](t: CountTableRef[A], key: A): var int {.deprecated.} =
result = t[][key] result = t[][key]
proc getOrDefault*[A](t: CountTableRef[A], key: A): int = proc getOrDefault*[A](t: CountTableRef[A], key: A): int =
getOrDefaultImpl(t, key) result = t[].getOrDefault(key)
proc hasKey*[A](t: CountTableRef[A], key: A): bool = proc hasKey*[A](t: CountTableRef[A], key: A): bool =
## returns true iff `key` is in the table `t`. ## returns true iff `key` is in the table `t`.
@ -1028,3 +1028,15 @@ when isMainModule:
assert(merged["foo"] == 5) assert(merged["foo"] == 5)
assert(merged["bar"] == 3) assert(merged["bar"] == 3)
assert(merged["baz"] == 14) assert(merged["baz"] == 14)
block:
const testKey = "TESTKEY"
let t: CountTableRef[string] = newCountTable[string]()
# Before, does not compile with error message:
#test_counttable.nim(7, 43) template/generic instantiation from here
#lib/pure/collections/tables.nim(117, 21) template/generic instantiation from here
#lib/pure/collections/tableimpl.nim(32, 27) Error: undeclared field: 'hcode
doAssert 0 == t.getOrDefault(testKey)
t.inc(testKey,3)
doAssert 3 == t.getOrDefault(testKey)