diff options
author | Martin Odersky <odersky@gmail.com> | 2005-10-06 16:14:15 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2005-10-06 16:14:15 +0000 |
commit | 307cda5cadc4b538e207eb7083e4a09da5142ed3 (patch) | |
tree | 7edcc4a1315dd78c635e7ed530de20461f256f4b /sources | |
parent | e21ba6a4618e0d7a1aa5b722e30942627e81dbff (diff) | |
download | scala-307cda5cadc4b538e207eb7083e4a09da5142ed3.tar.gz scala-307cda5cadc4b538e207eb7083e4a09da5142ed3.tar.bz2 scala-307cda5cadc4b538e207eb7083e4a09da5142ed3.zip |
*** empty log message ***
Diffstat (limited to 'sources')
-rwxr-xr-x | sources/scala/tools/nsc/typechecker/Namers.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sources/scala/tools/nsc/typechecker/Namers.scala b/sources/scala/tools/nsc/typechecker/Namers.scala index f55a201a7b..9f9243eb26 100755 --- a/sources/scala/tools/nsc/typechecker/Namers.scala +++ b/sources/scala/tools/nsc/typechecker/Namers.scala @@ -84,9 +84,11 @@ trait Namers: Analyzer { private def enterModuleSymbol(pos: int, mods: int, name: Name): Symbol = { var m: Symbol = context.scope.lookup(name); - if (m.isTerm && !m.isPackage && m.isExternal && (context.scope == m.owner.info.decls)) { + if (m.isModule && !m.isPackage && m.isExternal && (context.scope == m.owner.info.decls)) { updatePosFlags(m, pos, mods) } else { + if (m.isTerm && !m.isPackage && m.isExternal && (context.scope == m.owner.info.decls)) + context.scope.unlink(m); m = context.owner.newModule(pos, name); m.setFlag(mods); m.moduleClass.setFlag(mods); |