diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-05-17 15:21:22 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-05-17 15:21:22 +0200 |
| commit | bf6c2c5ccfd33cc8aab53b98dbce0619f8633d84 (patch) | |
| tree | bafa67febeed93ac44278d593ca26b1cb22ea32d /compiler/commands.nim | |
| parent | 2a7fc84c86c48c6ca6354c8c2f9232c3f1a0b049 (diff) | |
| download | Nim-bf6c2c5ccfd33cc8aab53b98dbce0619f8633d84.tar.gz | |
preparations of making compiler/msgs.nim free of global variables
Diffstat (limited to 'compiler/commands.nim')
| -rw-r--r-- | compiler/commands.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/commands.nim b/compiler/commands.nim index d1ffda34c..b8ca918f9 100644 --- a/compiler/commands.nim +++ b/compiler/commands.nim @@ -289,14 +289,14 @@ proc processPath(conf: ConfigRef; path: string, info: TLineInfo, else: conf.projectPath / path try: - result = pathSubs(conf, p, info.toFullPath().splitFile().dir) + result = pathSubs(conf, p, toFullPath(conf, info).splitFile().dir) except ValueError: localError(conf, info, "invalid path: " & p) result = p proc processCfgPath(conf: ConfigRef; path: string, info: TLineInfo): string = let path = if path[0] == '"': strutils.unescape(path) else: path - let basedir = info.toFullPath().splitFile().dir + let basedir = toFullPath(conf, info).splitFile().dir let p = if os.isAbsolute(path) or '$' in path: path else: @@ -322,7 +322,7 @@ proc trackDirty(conf: ConfigRef; arg: string, info: TLineInfo) = let dirtyOriginalIdx = fileInfoIdx(conf, a[1]) if dirtyOriginalIdx.int32 >= 0: - msgs.setDirtyFile(dirtyOriginalIdx, a[0]) + msgs.setDirtyFile(conf, dirtyOriginalIdx, a[0]) gTrackPos = newLineInfo(dirtyOriginalIdx, line, column) |