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

Minor bugfixes

Browse source
This commit is contained in:
Ganesh Viswanathan 2018-03-13 17:05:40 -05:00
commit 6d0abefe8a
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nimgen.nim
View file

@ -283,7 +283,8 @@ proc getIncls(file: string, inline=false): seq[string] =
for f in content.findIter(re"(?m)^\s*#\s*include\s+(.*?)$"):
var inc = f.captures[0].strip()
if ((QUOTES and inc.contains("\"")) or (FILTER != "" and FILTER in inc)) and (not exclude(inc)):
result.add(inc.replace(re"""[<>"]""", "").strip())
result.add(
inc.replace(re"""[<>"]""", "").replace(re"\/[\*\/].*$", "").strip())
result = result.deduplicate()
@ -337,6 +338,8 @@ proc runPreprocess(file, ppflags, flags: string, inline: bool): string =
start = false
if sfile in line.replace("\\", "/").replace("//", "/"):
start = true
if not ("\\" in line) and not ("/" in line) and extractFilename(sfile) in line:
start = true
else:
if start:
rdata.add(
@ -641,9 +644,9 @@ proc runCfg(cfg: string) =
let (key, val) = getKey(wild)
if val == true:
if key == "wildcard":
wildcard = CONFIG["n.wildcard"][key]
wildcard = CONFIG["n.wildcard"][wild]
else:
WILDCARDS.setSectionKey(wildcard, key, CONFIG["n.wildcard"][key])
WILDCARDS.setSectionKey(wildcard, wild, CONFIG["n.wildcard"][wild])
for file in CONFIG.keys():
if file in @["n.global", "n.include", "n.exclude", "n.prepare", "n.wildcard"]: