should be good for now

metagn · Nov 14, 2024 · cc95dfa · cc95dfa
1 parent f4cafe7
commit cc95dfa
Show file tree

Hide file tree

Showing 3 changed files with 176 additions and 111 deletions.
diff --git a/compiler/cbuilderdecls.nim b/compiler/cbuilderdecls.nim
@@ -468,6 +468,18 @@ proc addUnnamedParam(builder: var Builder, params: var ProcParamBuilder, typ: Sn
     params.needsComma = true
   builder.add(typ)
 
+proc addProcTypedParam(builder: var Builder, paramBuilder: var ProcParamBuilder, callConv: TCallingConvention, name: string, rettype, params: Snippet) =
+  if paramBuilder.needsComma:
+    builder.add(", ")
+  else:
+    paramBuilder.needsComma = true
+  builder.add(CallingConvToStr[callConv])
+  builder.add("_PTR(")
+  builder.add(rettype)
+  builder.add(", ")
+  builder.add(name)
+  builder.add(params)
+
 proc addVarargsParam(builder: var Builder, params: var ProcParamBuilder) =
   # does not exist in NIFC, needs to be proc pragma
   if params.needsComma:

diff --git a/compiler/cbuilderexprs.nim b/compiler/cbuilderexprs.nim
@@ -35,9 +35,6 @@ proc procPtrTypeUnnamedNimCall(rettype, params: Snippet): Snippet =
 proc procPtrTypeUnnamed(callConv: TCallingConvention, rettype, params: Snippet): Snippet =
   CallingConvToStr[callConv] & "_PTR(" & rettype & ", )" & params
 
-proc procPtrType(callConv: TCallingConvention, rettype, name, params: Snippet): Snippet =
-  CallingConvToStr[callConv] & "_PTR(" & rettype & ", " & name & ")" & params
-
 type CppCaptureKind = enum None, ByReference, ByCopy
 
 template addCppLambda(builder: var Builder, captures: CppCaptureKind, params: Snippet, body: typed) =