diff options
| author | odersky <odersky@gmail.com> | 2016-11-17 11:22:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-17 11:22:53 +0100 |
| commit | 156a9d978c9dab8e63ce1677a8743487057533ba (patch) | |
| tree | 85c865b928f5f194aba78cfea776fe37892c97a5 /src/dotty/tools/dotc/core | |
| parent | 6f04ca7f497212df4172bdb119d523388c42d5fd (diff) | |
| parent | e8a09cd0e21d4d51fb877ddd4d2b0c409ff906b9 (diff) | |
| download | dotty-156a9d978c9dab8e63ce1677a8743487057533ba.tar.gz dotty-156a9d978c9dab8e63ce1677a8743487057533ba.tar.bz2 dotty-156a9d978c9dab8e63ce1677a8743487057533ba.zip | |
Merge pull request #1720 from dotty-staging/fix-i1701
fix #1701: disqualify package name in type name resolution
Diffstat (limited to 'src/dotty/tools/dotc/core')
| -rw-r--r-- | src/dotty/tools/dotc/core/Symbols.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/Symbols.scala b/src/dotty/tools/dotc/core/Symbols.scala index 38b2c8bd6..b5bd196d2 100644 --- a/src/dotty/tools/dotc/core/Symbols.scala +++ b/src/dotty/tools/dotc/core/Symbols.scala @@ -428,7 +428,7 @@ object Symbols { final def entered(implicit ctx: Context): this.type = { assert(this.owner.isClass, s"symbol ($this) entered the scope of non-class owner ${this.owner}") // !!! DEBUG this.owner.asClass.enter(this) - if (this is Module) this.owner.asClass.enter(this.moduleClass) + if (this.is(Module, butNot = Package)) this.owner.asClass.enter(this.moduleClass) this } |