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

Fix #123

Browse source
This commit is contained in:
Ganesh Viswanathan 2019-04-06 18:33:40 -05:00
commit 2bad84c4c1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nimterop/getters.nim
View file

@ -74,7 +74,7 @@ const gTypeMap = {
}.toTable() }.toTable()
proc sanitizePath*(path: string): string = proc sanitizePath*(path: string): string =
path.multiReplace([("\\\\", $DirSep), ("\\", $DirSep), ("//", $DirSep)]) path.multiReplace([("\\\\", $DirSep), ("\\", $DirSep), ("/", $DirSep)])
proc getType*(str: string): string = proc getType*(str: string): string =
if str == "void": if str == "void":
@ -216,7 +216,7 @@ proc getPreprocessor*(fullpath: string, mode = "cpp"): string =
for def in gStateRT.defines: for def in gStateRT.defines:
cmd &= &"-D{def} " cmd &= &"-D{def} "
cmd &= &"\"{fullpath.quoteShell}\"" cmd &= &"{fullpath.quoteShell}"
# Include content only from file # Include content only from file
for line in execAction(cmd).splitLines(): for line in execAction(cmd).splitLines():
@ -231,7 +231,7 @@ proc getPreprocessor*(fullpath: string, mode = "cpp"): string =
start = true start = true
elif gStateRT.recurse: elif gStateRT.recurse:
let let
pDir = sfile.expandFilename().parentDir() pDir = sfile.expandFilename().parentDir().sanitizePath()
if pDir.len == 0 or pDir in saniLine: if pDir.len == 0 or pDir in saniLine:
start = true start = true
else: else: