diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-01 09:54:41 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-01 09:54:41 -0700 |
| commit | 2dd7142401d85badff451a6d3bb15eb84f4e9fa9 (patch) | |
| tree | d064fe397c6f51fc3c6ab17375b63778a3f4a44d /src/compiler | |
| parent | 6f273cb58ba69cc8b30ec9b1b31dc015e0ef1a62 (diff) | |
| parent | 187c61a0e49c8f880a0599d64955e47e167579dc (diff) | |
| download | scala-2dd7142401d85badff451a6d3bb15eb84f4e9fa9.tar.gz scala-2dd7142401d85badff451a6d3bb15eb84f4e9fa9.tar.bz2 scala-2dd7142401d85badff451a6d3bb15eb84f4e9fa9.zip | |
Merge pull request #1550 from paulp/issue/6597
Fix for SI-6597, implicit case class crasher.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 2c4034db84..99b927af66 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -414,7 +414,7 @@ trait Namers extends MethodSynthesis { * a module definition or a class definition. */ def enterModuleSymbol(tree : ModuleDef): Symbol = { - var m: Symbol = context.scope.lookup(tree.name) + var m: Symbol = context.scope lookupAll tree.name find (_.isModule) getOrElse NoSymbol val moduleFlags = tree.mods.flags | MODULE if (m.isModule && !m.isPackage && inCurrentScope(m) && (currentRun.canRedefine(m) || m.isSynthetic)) { updatePosFlags(m, tree.pos, moduleFlags) |