diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-17 20:29:33 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-01-17 20:30:15 -0800 |
| commit | 22ab72f3021b46435bef3437ff1d2ea3a7cc30c7 (patch) | |
| tree | eb072eefcd20d72944a0e445f5b0376df2c7e2af /src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala | |
| parent | 7c0fd124a636bb0dcca236d5aaf7e799c40d6104 (diff) | |
| parent | 97b9b2c06a5f562b749eb34834096118f21ca843 (diff) | |
| download | scala-22ab72f3021b46435bef3437ff1d2ea3a7cc30c7.tar.gz scala-22ab72f3021b46435bef3437ff1d2ea3a7cc30c7.tar.bz2 scala-22ab72f3021b46435bef3437ff1d2ea3a7cc30c7.zip | |
Merge commit '97b9b2c06a' from 2.10.x into master
Check files updated: test/files/presentation/t8085*.check
Conflicts:
build.xml
src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab/BrowsingLoaders.scala')
| -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 4b9e056df3..c2d0f5ccec 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 GlobalSymbolLoaders { 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) } |