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

Fix CountTableRef#getOrDefault

Browse source 
Fixes issue with CountTableRef and getOrDefault:
```{nimrod}
import tables

proc main() =
  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'

  echo "Count of " & testKey & " is " & $t.getOrDefault(testKey)
  t.inc(testKey,3)
  echo "Count of " & testKey & " is " & $t.getOrDefault(testKey)

when isMainModule:
  main()
```

Previously, `getOrDefault` for CountTableRef objects was calling the
`getOrDefaultImpl` template, which used the t.data.hcode object -
assuming a Table or similar object.  Because CountTableRef didn't have
an hcode in its data tuples, this wouldn't compile.  Changed to be the
same as `CountTable#getOrDefault`.
This commit is contained in:
Sloane Simmons 2016-01-09 21:13:34 -06:00
commit aa0d65ed70
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)