diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-01 09:56:17 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-01 09:56:17 -0700 |
| commit | 999918311b7bf764916431485cb11043f1c220ed (patch) | |
| tree | 9df1a526619025705833eb8a5ca1393c9dfeba5f /src | |
| parent | 290220bc6f5e1a11e38c67eb3e51ec617f96a1f6 (diff) | |
| parent | 1e2328ea6a8b592b5a2abe3557dc633e96f688f2 (diff) | |
| download | scala-999918311b7bf764916431485cb11043f1c220ed.tar.gz scala-999918311b7bf764916431485cb11043f1c220ed.tar.bz2 scala-999918311b7bf764916431485cb11043f1c220ed.zip | |
Merge pull request #1551 from adriaanm/paulp-issue-6597-2.10.x
Fix for SI-6597, implicit case class crasher.
Diffstat (limited to 'src')
| -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 9e9a22d4d1..e1afe153ad 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -398,7 +398,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) |