This commit is contained in:
Andreas Rumpf 2016-03-05 14:37:11 +01:00
commit ef36a9dc3d

View file

@ -67,7 +67,7 @@ proc parseLine(p: var TTmplParser) =
keyw: string keyw: string
j = 0 j = 0
while p.x[j] == ' ': inc(j) while p.x[j] == ' ': inc(j)
if p.x[0] == p.nimDirective and p.x[1] in {'?', '!'}: if p.x[0] == p.nimDirective and p.x[1] == '?':
newLine(p) newLine(p)
elif p.x[j] == p.nimDirective: elif p.x[j] == p.nimDirective:
newLine(p) newLine(p)
@ -213,6 +213,9 @@ proc filterTmpl(stdin: PLLStream, filename: string, call: PNode): PLLStream =
p.conc = strArg(call, "conc", 4, " & ") p.conc = strArg(call, "conc", 4, " & ")
p.toStr = strArg(call, "tostring", 5, "$") p.toStr = strArg(call, "tostring", 5, "$")
p.x = newStringOfCap(120) p.x = newStringOfCap(120)
# do not process the first line which contains the directive:
if llStreamReadLine(p.inp, p.x):
p.info.line = p.info.line + int16(1)
while llStreamReadLine(p.inp, p.x): while llStreamReadLine(p.inp, p.x):
p.info.line = p.info.line + int16(1) p.info.line = p.info.line + int16(1)
parseLine(p) parseLine(p)