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

[refactor] compiler/[msgs, reorder, semstmts]: use toMsgFilename where appropriate (#11595)

Browse source 
* compiler/msgs: toMsgFilename now operates on FileIndex
* compiler/reorder: use toMsgFilename for compiler messages
* compiler/semstmts: respect listFullPaths for recursive deps error
This commit is contained in:
alaviss 2019-06-26 19:38:19 +07:00 • committed by Andreas Rumpf
commit 993b3909a8
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/msgs.nim
View file

@ -195,12 +195,10 @@ template toFullPath*(conf: ConfigRef; info: TLineInfo): string =
template toFullPathConsiderDirty*(conf: ConfigRef; info: TLineInfo): string =
string toFullPathConsiderDirty(conf, info.fileIndex)
proc toMsgFilename*(conf: ConfigRef; info: TLineInfo): string =
if info.fileIndex.int32 < 0:
return "???"
proc toMsgFilename*(conf: ConfigRef; info: FileIndex): string =
let
absPath = conf.m.fileInfos[info.fileIndex.int32].fullPath.string
relPath = conf.m.fileInfos[info.fileIndex.int32].projPath.string
absPath = toFullPath(conf, info)
relPath = toFilename(conf, info)
result = if (optListFullPaths in conf.globalOptions) or
(relPath.len > absPath.len) or
(relPath.count("..") > 2):
@ -208,6 +206,9 @@ proc toMsgFilename*(conf: ConfigRef; info: TLineInfo): string =
else:
relPath
template toMsgFilename*(conf: ConfigRef; info: TLineInfo): string =
toMsgFilename(conf, info.fileIndex)
proc toLinenumber*(info: TLineInfo): int {.inline.} =
result = int info.line