diff options
| author | Lolo Iccl <oxisccl@gmail.com> | 2017-01-18 00:58:50 +0900 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2017-01-17 16:58:50 +0100 |
| commit | b6b5a11be78961cebd4f3d0b354b227373f64427 (patch) | |
| tree | 6b8491fd89f1e6d22f842cae98ba44186d10baa8 /compiler | |
| parent | 454547da8efe7e07b0c13254c6a000e805e2475e (diff) | |
| download | Nim-b6b5a11be78961cebd4f3d0b354b227373f64427.tar.gz | |
Fixes #5112 (Fix error messages raised when multiple modules have the same original name) (#5220)
Fixes #5112
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/modules.nim | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/modules.nim b/compiler/modules.nim index 3451d85ec..4763ac79b 100644 --- a/compiler/modules.nim +++ b/compiler/modules.nim @@ -133,11 +133,12 @@ proc newModule(graph: ModuleGraph; fileIdx: int32): PSym = rawMessage(errInvalidModuleName, result.name.s) result.info = newLineInfo(fileIdx, 1, 1) - let pack = getIdent(getPackageName(filename)) + let + pck = getPackageName(filename) + pck2 = if pck.len > 0: pck else: "unknown" + pack = getIdent(pck2) var packSym = graph.packageSyms.strTableGet(pack) if packSym == nil: - let pck = getPackageName(filename) - let pck2 = if pck.len > 0: pck else: "unknown" packSym = newSym(skPackage, getIdent(pck2), nil, result.info) initStrTable(packSym.tab) graph.packageSyms.strTableAdd(packSym) |