diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-08 22:51:18 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-08 22:51:18 +0200 |
| commit | a469cabc3eaf18a8a41cbcb1de4da6a7d459c861 (patch) | |
| tree | b947a3a1bc0fdc6cfe8955b50f63a38926daaa5a /src/compiler/scala/tools/nsc/symtab | |
| parent | 6a0b66185096dd9703010a2069fc79cc1e53031d (diff) | |
| parent | b7f91a206cca9ab9bb87d0f7872ddf213ba10f82 (diff) | |
| download | scala-a469cabc3eaf18a8a41cbcb1de4da6a7d459c861.tar.gz scala-a469cabc3eaf18a8a41cbcb1de4da6a7d459c861.tar.bz2 scala-a469cabc3eaf18a8a41cbcb1de4da6a7d459c861.zip | |
Merge pull request #3728 from retronym/topic/merge-2.10.x
Merge 2.10.x to 2.11.x
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index ea600bc586..d7cd92adf2 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -356,9 +356,13 @@ abstract class ClassfileParser { // SI-5593 Scaladoc's current strategy is to visit all packages in search of user code that can be documented // therefore, it will rummage through the classpath triggering errors whenever it encounters package objects // that are not in their correct place (see bug for details) - if (!settings.isScaladoc) - warning(s"Class $name not found - continuing with a stub.") - return NoSymbol.newClass(name.toTypeName) + + // TODO More consistency with use of stub symbols in `Unpickler` + // - better owner than `NoSymbol` + // - remove eager warning + val msg = s"Class $name not found - continuing with a stub." + if (!settings.isScaladoc) warning(msg) + return NoSymbol.newStubSymbol(name.toTypeName, msg) } val completer = new loaders.ClassfileLoader(file) var owner: Symbol = rootMirror.RootClass |