diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-18 15:55:28 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-12-18 15:55:28 -0800 |
| commit | 97b9b2c06a5f562b749eb34834096118f21ca843 (patch) | |
| tree | 842325683b4d5458e1ae639718a75c3bc32d25f7 /src | |
| parent | 5cbb5a7f626aa7bd305ad8ce2ad96ee742315536 (diff) | |
| parent | 7e85b595502974bebf2f2625c6bc3645f0d3ab27 (diff) | |
| download | scala-97b9b2c06a5f562b749eb34834096118f21ca843.tar.gz scala-97b9b2c06a5f562b749eb34834096118f21ca843.tar.bz2 scala-97b9b2c06a5f562b749eb34834096118f21ca843.zip | |
Merge pull request #3282 from retronym/ticket/8085
Fix BrowserTraverser for package objects
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala b/src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala index f2aab36b51..c7bd678385 100644 --- a/src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala +++ b/src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala @@ -64,8 +64,10 @@ abstract class BrowsingLoaders extends SymbolLoaders { addPackagePrefix(pre) packagePrefix += ("." + name) case Ident(name) => - if (packagePrefix.length != 0) packagePrefix += "." - packagePrefix += name + if (name != nme.EMPTY_PACKAGE_NAME) { // mirrors logic in Namers, see createPackageSymbol + if (packagePrefix.length != 0) packagePrefix += "." + packagePrefix += name + } case _ => throw new MalformedInput(pkg.pos.point, "illegal tree node in package prefix: "+pkg) } |