diff options
author | Eugene Vigdorchik <eugenevigdorchik@epfl.ch> | 2010-12-21 15:35:27 +0000 |
---|---|---|
committer | Eugene Vigdorchik <eugenevigdorchik@epfl.ch> | 2010-12-21 15:35:27 +0000 |
commit | f79c93cd22979e779b9a958717d2276fd3b632b0 (patch) | |
tree | c1e1873344e7d5d6dad74b400fc75fa970e2b866 | |
parent | ed9fb7210448a11bae0f368ff021bacf00654c39 (diff) | |
download | scala-f79c93cd22979e779b9a958717d2276fd3b632b0.tar.gz scala-f79c93cd22979e779b9a958717d2276fd3b632b0.tar.bz2 scala-f79c93cd22979e779b9a958717d2276fd3b632b0.zip |
I really don't know the proper way to fix it in...
I really don't know the proper way to fix it in the current setting, so
just guarding.
-rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index aa139d3a92..afb4c2268e 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -153,7 +153,14 @@ self => override lazy val loaders = new SymbolLoaders { val global: Global.this.type = Global.this override def enterToplevelsFromSource(root: Symbol, name: String, src: AbstractFile) { - currentRun.compileLate(src) // todo: change + // todo: change + if (root.isEmptyPackageClass) { + // currentRun is null for the empty package, since its type is taken during currentRun + // initialization. todo: remove when refactored. + super.enterToplevelsFromSource(root, name, src) + } else { + currentRun.compileLate(src) + } } } |