diff options
| -rw-r--r-- | compiler/importer.nim | 2 | ||||
| -rw-r--r-- | compiler/options.nim | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/importer.nim b/compiler/importer.nim index 46e4c159f..b7e574c62 100644 --- a/compiler/importer.nim +++ b/compiler/importer.nim @@ -169,7 +169,7 @@ proc myImportModule(c: PContext, n: PNode): PSym = if recursion >= 0: var err = "" for i in countup(recursion, L-1): - if i > 0: err.add "\n" + if i > recursion: err.add "\n" err.add toFullPath(c.graph.importStack[i]) & " imports " & toFullPath(c.graph.importStack[i+1]) localError(n.info, "recursive module dependency detected:\n" & err) diff --git a/compiler/options.nim b/compiler/options.nim index f8db3927a..9edafb17a 100644 --- a/compiler/options.nim +++ b/compiler/options.nim @@ -232,10 +232,10 @@ proc canonicalizePath*(path: string): string = proc shortenDir*(dir: string): string = ## returns the interesting part of a dir - var prefix = getPrefixDir() & DirSep + var prefix = gProjectPath & DirSep if startsWith(dir, prefix): return substr(dir, len(prefix)) - prefix = gProjectPath & DirSep + prefix = getPrefixDir() & DirSep if startsWith(dir, prefix): return substr(dir, len(prefix)) result = dir |