diff options
| author | Paul Phillips <paulp@improving.org> | 2012-11-04 13:07:05 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-11-04 13:07:05 -0800 |
| commit | 3d248efcc1925acb7f73b2b2db2184f8d33b68ad (patch) | |
| tree | 161086d04159db62e8ece2d28697e022111f9530 /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
| parent | 2c6777fd53b93b95a261aadc87a5cbc03c14d503 (diff) | |
| parent | c04a4edcac9e6ecf653159942394a82d579f1f88 (diff) | |
| download | scala-3d248efcc1925acb7f73b2b2db2184f8d33b68ad.tar.gz scala-3d248efcc1925acb7f73b2b2db2184f8d33b68ad.tar.bz2 scala-3d248efcc1925acb7f73b2b2db2184f8d33b68ad.zip | |
Merge pull request #1554 from paulp/scope-lookup
Improvements to scope lookup.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 5e537e3bb3..3bf7976241 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -380,8 +380,8 @@ trait Namers extends MethodSynthesis { if (sym eq NoSymbol) return val ctx = if (context.owner.isPackageObjectClass) context.outer else context - val module = if (sym.isModule) sym else ctx.scope lookup tree.name.toTermName - val clazz = if (sym.isClass) sym else ctx.scope lookup tree.name.toTypeName + val module = if (sym.isModule) sym else ctx.scope lookupModule tree.name + val clazz = if (sym.isClass) sym else ctx.scope lookupClass tree.name val fails = ( module.isModule && clazz.isClass |