remove overriden default call in tables.getOrDefault

fixes nim-lang#23587
metagn · Oct 8, 2024 · e7ec178 · e7ec178
1 parent d72b848
commit e7ec178
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/pure/collections/tables.nim b/lib/pure/collections/tables.nim
@@ -434,7 +434,6 @@ proc getOrDefault*[A, B](t: Table[A, B], key: A, default: B): B =
     let a = {'a': 5, 'b': 9}.toTable
     doAssert a.getOrDefault('a', 99) == 5
     doAssert a.getOrDefault('z', 99) == 99
-  result = default(B)
   getOrDefaultImpl(t, key, default)
 
 proc mgetOrPut*[A, B](t: var Table[A, B], key: A, val: B): var B =

diff --git a/tests/stdlib/ttables.nim b/tests/stdlib/ttables.nim
@@ -314,3 +314,18 @@ block countTableWithoutInit:
   d.inc("f")
   merge(d, e)
   doAssert d["f"] == 7
+
+block: # issue #23587
+  type
+    A = proc ()
+
+  proc main =
+    let repo = initTable[uint32, A]()
+
+    let c1 = repo.getOrDefault(uint32(1), nil)
+    doAssert c1.isNil
+
+    let c2 = repo.getOrDefault(uint32(1), A(nil))
+    doAssert c2.isNil
+
+  main()