mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2025-12-31 02:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1304 from rbehrends/fix-packagenames

Browse Source 
Fix generation of package-dependent init names.
This commit is contained in:
Andreas Rumpf
2014-07-01 03:00:38 +02:00
parent b1c5dc1ef9 55e7d91b31
commit 0eda72e1d2
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/cgen.nim
View File

@@ -1050,6 +1050,7 @@ proc getSomeInitName(m: PSym, suffix: string): PRope =
assert m.owner.kind == skPackage
if {sfSystemModule, sfMainModule} * m.flags == {}:
result = m.owner.name.s.mangle.toRope
result.app "_"
result.app m.name.s
result.app suffix

2
compiler/modules.nim
View File

@@ -115,7 +115,7 @@ proc newModule(fileIdx: int32): PSym =
new(result)
result.id = - 1 # for better error checking
result.kind = skModule
let filename = fileIdx.toFilename
let filename = fileIdx.toFullPath
result.name = getIdent(splitFile(filename).name)
if not isNimrodIdentifier(result.name.s):
rawMessage(errInvalidModuleName, result.name.s)