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

More multiReplaces

Browse source
This commit is contained in:
data-man 2018-07-15 04:49:24 +03:00
commit 2d06bdcccf
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/nimgen/external.nim
View file

@ -123,18 +123,15 @@ proc runPreprocess*(file, ppflags, flags: string, inline: bool): string =
if line.strip() != "": if line.strip() != "":
if line[0] == '#' and not line.contains("#pragma"): if line[0] == '#' and not line.contains("#pragma"):
start = false start = false
if sfile in line.replace("\\", "/").replace("//", "/"): if sfile in line.multiReplace([("\\", "/"), ("//", "/")]):
start = true start = true
if not ("\\" in line) and not ("/" in line) and extractFilename(sfile) in line: if not ("\\" in line) and not ("/" in line) and extractFilename(sfile) in line:
start = true start = true
else: else:
if start: if start:
rdata.add( rdata.add(
line.replace("_Noreturn", "") line.multiReplace([("_Noreturn", ""), ("(())", ""), ("WINAPI", ""),
.replace("(())", "") ("__attribute__", ""), ("extern \"C\"", "")])
.replace("WINAPI", "")
.replace("__attribute__", "")
.replace("extern \"C\"", "")
.replace(re"\(\([_a-z]+?\)\)", "") .replace(re"\(\([_a-z]+?\)\)", "")
.replace(re"\(\(__format__[\s]*\(__[gnu_]*printf__, [\d]+, [\d]+\)\)\);", ";") & "\n" .replace(re"\(\(__format__[\s]*\(__[gnu_]*printf__, [\d]+, [\d]+\)\)\);", ";") & "\n"
) )