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

cstring support

Browse source
This commit is contained in:
Ganesh Viswanathan 2019-01-16 00:11:53 -06:00
commit e9a5ccc007
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nimterop/getters.nim
View file

@ -80,6 +80,15 @@ proc getType*(str: string): string =
if gTypeMap.hasKey(result): if gTypeMap.hasKey(result):
result = gTypeMap[result] result = gTypeMap[result]
proc getPtrType*(str: string): string =
result = case str:
of "ptr cchar":
"cstring"
of "ptr object":
"pointer"
else:
str
proc getLit*(str: string): string = proc getLit*(str: string): string =
if str.contains(re"^[\-]?[\d]+$") or if str.contains(re"^[\-]?[\d]+$") or
str.contains(re"^[\-]?[\d]*\.[\d]+$") or str.contains(re"^[\-]?[\d]*\.[\d]+$") or

16
nimterop/grammar.nim
View file

@ -85,7 +85,7 @@ proc initGrammar() =
count += 1 count += 1
i += 1 i += 1
if ptyp != "object": if ptyp != "object":
pout &= &"{pname}: {pptr}{ptyp}," pout &= &"{pname}: {getPtrType(pptr&ptyp)},"
# typedef int X # typedef int X
# typedef X Y # typedef X Y
@ -141,7 +141,7 @@ proc initGrammar() =
if pout.len != 0 and pout[^1] == ',': if pout.len != 0 and pout[^1] == ',':
pout = pout[0 .. ^2] pout = pout[0 .. ^2]
if typ != "object": if typ != "object":
gStateRT.typeStr &= &" {name}* = proc({pout}): {tptr}{typ} {{.nimcall.}}\n" gStateRT.typeStr &= &" {name}* = proc({pout}): {getPtrType(tptr&typ)} {{.nimcall.}}\n"
else: else:
gStateRT.typeStr &= &" {name}* = proc({pout}) {{.nimcall.}}\n" gStateRT.typeStr &= &" {name}* = proc({pout}) {{.nimcall.}}\n"
else: else:
@ -149,12 +149,12 @@ proc initGrammar() =
if i < gStateRT.data.len and gStateRT.data[i].name in ["identifier", "number_literal"]: if i < gStateRT.data.len and gStateRT.data[i].name in ["identifier", "number_literal"]:
let let
flen = gStateRT.data[i].val.getIdentifier() flen = gStateRT.data[i].val.getIdentifier()
gStateRT.typeStr &= &" {name}* = {aptr}array[{flen}, {tptr}{typ}]\n" gStateRT.typeStr &= &" {name}* = {aptr}array[{flen}, {getPtrType(tptr&typ)}]\n"
else: else:
if name == typ or typ == "object": if name == typ or typ == "object":
gStateRT.typeStr &= &" {name}* = object\n" gStateRT.typeStr &= &" {name}* = object\n"
else: else:
gStateRT.typeStr &= &" {name}* = {tptr}{typ}\n" gStateRT.typeStr &= &" {name}* = {getPtrType(tptr&typ)}\n"
)) ))
proc pStructCommon(ast: ref Ast, node: TSNode, name: string, fstart, fend: int) = proc pStructCommon(ast: ref Ast, node: TSNode, name: string, fstart, fend: int) =
@ -211,7 +211,7 @@ proc initGrammar() =
if i+1 < gStateRT.data.len-fend and gStateRT.data[i+1].name in ["identifier", "number_literal"]: if i+1 < gStateRT.data.len-fend and gStateRT.data[i+1].name in ["identifier", "number_literal"]:
let let
flen = gStateRT.data[i+1].val.getIdentifier() flen = gStateRT.data[i+1].val.getIdentifier()
gStateRT.typeStr &= &" {fname}*: {aptr}array[{flen}, {fptr}{ftyp}]\n" gStateRT.typeStr &= &" {fname}*: {aptr}array[{flen}, {getPtrType(fptr&ftyp)}]\n"
i += 2 i += 2
elif i+1 < gStateRT.data.len-fend and gStateRT.data[i+1].name == "function_declarator": elif i+1 < gStateRT.data.len-fend and gStateRT.data[i+1].name == "function_declarator":
var var
@ -232,7 +232,7 @@ proc initGrammar() =
if pout.len != 0 and pout[^1] == ',': if pout.len != 0 and pout[^1] == ',':
pout = pout[0 .. ^2] pout = pout[0 .. ^2]
if ftyp != "object": if ftyp != "object":
gStateRT.typeStr &= &" {fname}*: proc({pout}): {fptr}{ftyp} {{.nimcall.}}\n" gStateRT.typeStr &= &" {fname}*: proc({pout}): {getPtrType(fptr&ftyp)} {{.nimcall.}}\n"
else: else:
gStateRT.typeStr &= &" {fname}*: proc({pout}) {{.nimcall.}}\n" gStateRT.typeStr &= &" {fname}*: proc({pout}) {{.nimcall.}}\n"
i += 1 i += 1
@ -240,7 +240,7 @@ proc initGrammar() =
if ftyp == "object": if ftyp == "object":
gStateRT.typeStr &= &" {fname}*: pointer\n" gStateRT.typeStr &= &" {fname}*: pointer\n"
else: else:
gStateRT.typeStr &= &" {fname}*: {fptr}{ftyp}\n" gStateRT.typeStr &= &" {fname}*: {getPtrType(fptr&ftyp)}\n"
i += 1 i += 1
let let
@ -438,7 +438,7 @@ proc initGrammar() =
if fnname notin gStateRT.procs: if fnname notin gStateRT.procs:
gStateRT.procs.add(fnname) gStateRT.procs.add(fnname)
if ftyp != "object": if ftyp != "object":
gStateRT.procStr &= &"proc {fnname}*({pout}): {fptr}{ftyp} {{.importc: \"{fname}\", header: {gStateRT.currentHeader}.}}\n" gStateRT.procStr &= &"proc {fnname}*({pout}): {getPtrType(fptr&ftyp)} {{.importc: \"{fname}\", header: {gStateRT.currentHeader}.}}\n"
else: else:
gStateRT.procStr &= &"proc {fnname}*({pout}) {{.importc: \"{fname}\", header: {gStateRT.currentHeader}.}}\n" gStateRT.procStr &= &"proc {fnname}*({pout}) {{.importc: \"{fname}\", header: {gStateRT.currentHeader}.}}\n"