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

make tcompilerapi green, don't assue projectPath exists

Browse source
This commit is contained in:
Araq 2018-09-14 19:30:02 +02:00
commit ed5d2b5505
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/pragmas.nim
View file

@ -583,11 +583,14 @@ proc pragmaLine(c: PContext, n: PNode) =
elif y.kind != nkIntLit: elif y.kind != nkIntLit:
localError(c.config, n.info, errIntLiteralExpected) localError(c.config, n.info, errIntLiteralExpected)
else: else:
# XXX check if paths are properly resolved this way: if c.config.projectPath.isEmpty:
let dir = toFullPath(c.config, n.info).splitFile.dir n.info.fileIndex = fileInfoIdx(c.config, AbsoluteFile(x.strVal))
let rel = if isAbsolute(x.strVal): relativeTo(AbsoluteFile(x.strVal), c.config.projectPath) else:
else: RelativeFile(x.strVal) # XXX this is still suspicous:
n.info.fileIndex = fileInfoIdx(c.config, AbsoluteDir(dir) / rel) let dir = toFullPath(c.config, n.info).splitFile.dir
let rel = if isAbsolute(x.strVal): relativeTo(AbsoluteFile(x.strVal), c.config.projectPath)
else: RelativeFile(x.strVal)
n.info.fileIndex = fileInfoIdx(c.config, AbsoluteDir(dir) / rel)
n.info.line = uint16(y.intVal) n.info.line = uint16(y.intVal)
else: else:
localError(c.config, n.info, "tuple expected") localError(c.config, n.info, "tuple expected")