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

Fix missing array type, suppress gcc warnings

Browse source
This commit is contained in:
Ganesh Viswanathan 2019-01-15 16:20:52 -06:00
commit 04d01a5f6e
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nimterop/getters.nim
View file

@ -129,7 +129,7 @@ proc removeStatic*(content: string): string =
proc getPreprocessor*(fullpath: string, mode = "cpp"): string = proc getPreprocessor*(fullpath: string, mode = "cpp"): string =
var var
mmode = if mode == "cpp": "c++" else: mode mmode = if mode == "cpp": "c++" else: mode
cmd = &"gcc -E -dD -x{mmode} " cmd = &"gcc -E -dD -x{mmode} -w "
rdata: seq[string] = @[] rdata: seq[string] = @[]
start = false start = false
@ -144,7 +144,7 @@ proc getPreprocessor*(fullpath: string, mode = "cpp"): string =
cmd &= &"\"{fullpath}\"" cmd &= &"\"{fullpath}\""
# Include content only from file # Include content only from file
for line in execAction(cmd, true).splitLines(): for line in execAction(cmd).splitLines():
if line.strip() != "": if line.strip() != "":
if line.len > 1 and line[0 .. 1] == "# ": if line.len > 1 and line[0 .. 1] == "# ":
start = false start = false

4
nimterop/grammar.nim
View file

@ -267,7 +267,9 @@ proc initGrammar() =
var var
offset = 0 offset = 0
if gStateRT.data[0].name == "type_identifier": if gStateRT.data.len > 1 and
gStateRT.data[0].name == "type_identifier" and
gStateRT.data[1].name != "field_identifier":
offset = 1 offset = 1
pStructCommon(ast, node, gStateRT.data[^1].val, offset, 1) pStructCommon(ast, node, gStateRT.data[^1].val, offset, 1)