From 80545a8221b5561ebf22f1ea5a0684ee35832f1e Mon Sep 17 00:00:00 2001 From: Ganesh Viswanathan Date: Tue, 7 May 2019 11:49:19 -0500 Subject: cdecl by default --- nimterop/grammar.nim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nimterop/grammar.nim b/nimterop/grammar.nim index daf5f15..22a0456 100644 --- a/nimterop/grammar.nim +++ b/nimterop/grammar.nim @@ -189,9 +189,9 @@ proc initGrammar(): Grammar = pout = pout[0 .. ^3] if tptr.len != 0 or typ != "object": - nimState.typeStr &= &"\n {nname}*{pragma} = proc({pout}): {getPtrType(tptr&typ)} {{.nimcall.}}" + nimState.typeStr &= &"\n {nname}*{pragma} = proc({pout}): {getPtrType(tptr&typ)} {{.cdecl.}}" else: - nimState.typeStr &= &"\n {nname}*{pragma} = proc({pout}) {{.nimcall.}}" + nimState.typeStr &= &"\n {nname}*{pragma} = proc({pout}) {{.cdecl.}}" else: if i < nimState.data.len and nimState.data[i].name in ["identifier", "number_literal"]: var @@ -321,9 +321,9 @@ proc initGrammar(): Grammar = if pout.len != 0 and pout[^2 .. ^1] == ", ": pout = pout[0 .. ^3] if fptr.len != 0 or ftyp != "object": - nimState.typeStr &= &"\n {fname}*: proc({pout}): {getPtrType(fptr&ftyp)} {{.nimcall.}}" + nimState.typeStr &= &"\n {fname}*: proc({pout}): {getPtrType(fptr&ftyp)} {{.cdecl.}}" else: - nimState.typeStr &= &"\n {fname}*: proc({pout}) {{.nimcall.}}" + nimState.typeStr &= &"\n {fname}*: proc({pout}) {{.cdecl.}}" i += 1 else: if ftyp == "object": @@ -579,7 +579,7 @@ proc initGrammar(): Grammar = if fnname.nBl and nimState.identifiers.addNewIdentifer(fnname): let ftyp = nimState.data[0].val.getIdentifier(nskType, fnname) - pragma = genPragma(nimState.genImportC(fname, fnname)) + pragma = genPragma(nimState.genImportC(fname, fnname), "cdecl") if fptr.len != 0 or ftyp != "object": nimState.procStr &= &"\nproc {fnname}*({pout}): {getPtrType(fptr&ftyp)}{pragma}" -- cgit v1.2.3