nimpretty: fixes #9384

(cherry picked from commit bd9d5787f0)
This commit is contained in:
Araq
2018-10-17 12:52:25 +02:00
committed by narimiran
parent aac04585ea
commit 64f5c96685
2 changed files with 11 additions and 7 deletions

View File

@@ -72,12 +72,16 @@ proc parsePipe(filename: AbsoluteFile, inputStream: PLLStream; cache: IdentCache
i = 0
inc linenumber
if i+1 < line.len and line[i] == '#' and line[i+1] == '?':
inc(i, 2)
while i < line.len and line[i] in Whitespace: inc(i)
var q: TParser
parser.openParser(q, filename, llStreamOpen(substr(line, i)), cache, config)
result = parser.parseAll(q)
parser.closeParser(q)
when defined(nimpretty2):
# XXX this is a bit hacky, but oh well...
quit "can't nimpretty a source code filter"
else:
inc(i, 2)
while i < line.len and line[i] in Whitespace: inc(i)
var q: TParser
parser.openParser(q, filename, llStreamOpen(substr(line, i)), cache, config)
result = parser.parseAll(q)
parser.closeParser(q)
llStreamClose(s)
proc getFilter(ident: PIdent): TFilterKind =

View File

@@ -9,7 +9,7 @@ var
failures = 0
when defined(develop):
const nimp = "bin/nimpretty".addFileExt(ExeExt)
const nimp = "bin" / "nimpretty".addFileExt(ExeExt)
if execShellCmd("nim c -o:$# nimpretty/nimpretty.nim" % [nimp]) != 0:
quit("FAILURE: compilation of nimpretty failed")
else: