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

make tests green again

Browse source
This commit is contained in:
Andreas Rumpf 2016-11-24 09:14:36 +01:00
commit 7be1c55cf1
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/importer.nim
View file

@ -169,7 +169,7 @@ proc myImportModule(c: PContext, n: PNode): PSym =
if recursion >= 0: if recursion >= 0:
var err = "" var err = ""
for i in countup(recursion, L-1): 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 " & err.add toFullPath(c.graph.importStack[i]) & " imports " &
toFullPath(c.graph.importStack[i+1]) toFullPath(c.graph.importStack[i+1])
localError(n.info, "recursive module dependency detected:\n" & err) localError(n.info, "recursive module dependency detected:\n" & err)

4
compiler/options.nim
View file

@ -232,10 +232,10 @@ proc canonicalizePath*(path: string): string =
proc shortenDir*(dir: string): string = proc shortenDir*(dir: string): string =
## returns the interesting part of a dir ## returns the interesting part of a dir
var prefix = getPrefixDir() & DirSep var prefix = gProjectPath & DirSep
if startsWith(dir, prefix): if startsWith(dir, prefix):
return substr(dir, len(prefix)) return substr(dir, len(prefix))
prefix = gProjectPath & DirSep prefix = getPrefixDir() & DirSep
if startsWith(dir, prefix): if startsWith(dir, prefix):
return substr(dir, len(prefix)) return substr(dir, len(prefix))
result = dir result = dir