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

fixes #12420 [backport] (#12456)

Browse source
This commit is contained in:
Andreas Rumpf 2019-10-18 22:13:24 +02:00 • committed by GitHub
commit 832b0a0232
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/packagehandling.nim
View file

@ -47,12 +47,9 @@ proc demanglePackageName*(path: string): string =
proc withPackageName*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile =
let x = getPackageName(conf, path.string)
if x.len == 0:
result = path
let (p, file, ext) = path.splitFile
if x == "stdlib":
# Hot code reloading now relies on 'stdlib_system' names etc.
result = p / RelativeFile((x & '_' & file) & ext)
else:
let (p, file, ext) = path.splitFile
if x == "stdlib":
# Hot code reloading now relies on 'stdlib_system' names etc.
result = p / RelativeFile((x & '_' & file) & ext)
else:
result = p / RelativeFile(fakePackageName(conf, path))
result = p / RelativeFile(fakePackageName(conf, path))

2
tests/modules/a/utils.nim Normal file
View file

@ -0,0 +1,2 @@
proc burnMem*(a: int) =
discard

2
tests/modules/b/utils.nim Normal file
View file

@ -0,0 +1,2 @@
# module b/utils.nim
let x* = 10

5
tests/modules/tutils_ab.nim Normal file
View file

@ -0,0 +1,5 @@
import a/utils as autils, b/utils
# bug #12420
burnMem(x)