aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer/Namer.scala
diff options
context:
space:
mode:
authorDmitry Petrashko <dmitry.petrashko@gmail.com>2015-03-26 15:53:34 +0100
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2015-03-26 16:20:37 +0100
commit5e09d2dda5a79cfe2e34c9c675fc5db669cb705c (patch)
tree7a00e6c298f8910ebe627e9c373da5e42b7c5ce9 /src/dotty/tools/dotc/typer/Namer.scala
parent880a6f5e10fed1be7df3c4878896fa90e591bb23 (diff)
downloaddotty-5e09d2dda5a79cfe2e34c9c675fc5db669cb705c.tar.gz
dotty-5e09d2dda5a79cfe2e34c9c675fc5db669cb705c.tar.bz2
dotty-5e09d2dda5a79cfe2e34c9c675fc5db669cb705c.zip
#435 Fix conflict between package object and case class with same name
Diffstat (limited to 'src/dotty/tools/dotc/typer/Namer.scala')
-rw-r--r--src/dotty/tools/dotc/typer/Namer.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/typer/Namer.scala b/src/dotty/tools/dotc/typer/Namer.scala
index 414f6e517..7cca608e6 100644
--- a/src/dotty/tools/dotc/typer/Namer.scala
+++ b/src/dotty/tools/dotc/typer/Namer.scala
@@ -411,7 +411,7 @@ class Namer { typer: Typer =>
case _ =>
}
}
- for (mdef @ ModuleDef(name, _) <- stats) {
+ for (mdef @ ModuleDef(name, _) <- stats if !mdef.mods.is(Flags.Package)) {
val typName = name.toTypeName
val Thicket(vdef :: (mcls @ TypeDef(_, impl: Template)) :: Nil) = mdef.attachment(ExpandedTree)
moduleDef(typName) = mcls