diff options
| author | Ganesh Viswanathan <dev@genotrance.com> | 2018-09-14 18:34:56 -0500 |
|---|---|---|
| committer | Ganesh Viswanathan <dev@genotrance.com> | 2018-09-14 18:34:56 -0500 |
| commit | 80520eef3cce0b3145dedc71a6652429adb9cc9e (patch) | |
| tree | d64725d2749cb82bfef997bbbdb443cc4827de6d /compiler/passes.nim | |
| parent | e07a256f74b9e89e49287c8a21c1334af43e27c2 (diff) | |
| parent | b9dc486db15bb1b4b6f3cef7626733b904d377f7 (diff) | |
| download | Nim-80520eef3cce0b3145dedc71a6652429adb9cc9e.tar.gz | |
Merge remote-tracking branch 'upstream/devel' into test-6483
Diffstat (limited to 'compiler/passes.nim')
| -rw-r--r-- | compiler/passes.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/passes.nim b/compiler/passes.nim index 45c726f2a..365731669 100644 --- a/compiler/passes.nim +++ b/compiler/passes.nim @@ -14,7 +14,7 @@ import strutils, options, ast, astalgo, llstream, msgs, platform, os, condsyms, idents, renderer, types, extccomp, math, magicsys, nversion, nimsets, syntaxes, times, idgen, modulegraphs, reorder, rod, - lineinfos + lineinfos, pathutils type @@ -106,7 +106,7 @@ proc processTopLevelStmt(n: PNode, a: var TPassContextArray): bool = proc resolveMod(conf: ConfigRef; module, relativeTo: string): FileIndex = let fullPath = findModule(conf, module, relativeTo) - if fullPath.len == 0: + if fullPath.isEmpty: result = InvalidFileIDX else: result = fileInfoIdx(conf, fullPath) @@ -160,7 +160,7 @@ proc processModule*(graph: ModuleGraph; module: PSym, stream: PLLStream): bool { let filename = toFullPathConsiderDirty(graph.config, fileIdx) s = llStreamOpen(filename, fmRead) if s == nil: - rawMessage(graph.config, errCannotOpenFile, filename) + rawMessage(graph.config, errCannotOpenFile, filename.string) return false else: s = stream |