fix call block (#36)

yglukhov · Oct 10, 2024 · 6df874d · 6df874d
1 parent 88a1380
commit 6df874d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/darwin/objc/blocks.nim b/darwin/objc/blocks.nim
@@ -138,17 +138,18 @@ proc toBlock*[T: proc](v: T): auto =
   convertToClosure(v)
 
 proc getInvokeType(procType: NimNode): NimNode =
-  result = copyNimTree(procType)
+  result = copyNimTree(getTypeImpl(procType))
   let pragmas = result[1]
+
 
   var i = 0
   while i < pragmas.len:
     if pragmas[i].kind in {nnkSym, nnkIdent} and $pragmas[i] == "closure":
       pragmas.del(i)
     else:
       inc i
-
-  pragmas.add(ident"cdecl")
+    
+  result.addPragma(ident"cdecl")
 
   result.params.insert(1, newIdentDefs(ident"<theblock>", ident"pointer"))
 

diff --git a/tests/tarrays.nim b/tests/tarrays.nim
@@ -31,6 +31,8 @@ proc test() =
 
 test()
 
+type MyBlock = proc(a:int): void
+
 proc testBlock() =
   var v = 5
   let bl = toBlock() do(a: int):
@@ -39,3 +41,12 @@ proc testBlock() =
   doAssert(v == 128)
 
 testBlock()
+
+proc testBlock2(cb: Block[MyBlock]) = 
+  cb.call(123)
+
+var v = 5
+let bl = toBlock() do(a: int):
+  v = v + a
+testBlock2(bl)
+doAssert(v == 128)