diff options
| author | Martin Odersky <odersky@gmail.com> | 2011-07-06 15:51:21 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2011-07-06 15:51:21 +0000 |
| commit | d0d8b498b81e32506876079683489a7a219cee39 (patch) | |
| tree | 4439e869063d977af5c62095904ba034ebf95bd1 /src/compiler/scala/tools/nsc/interactive/Global.scala | |
| parent | dbd2a2a626be10c5cb656e97c120258112f9c71a (diff) | |
| download | scala-d0d8b498b81e32506876079683489a7a219cee39.tar.gz scala-d0d8b498b81e32506876079683489a7a219cee39.tar.bz2 scala-d0d8b498b81e32506876079683489a7a219cee39.zip | |
Fixing two problems in Global.scala: crashes du...
Fixing two problems in Global.scala: crashes during logs of import
completions + interruprts at possibly inconsistent states. Review by
dotta.
Diffstat (limited to 'src/compiler/scala/tools/nsc/interactive/Global.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index 9e61e880c3..f89001c1fe 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -409,7 +409,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "") // ensure all loaded units are parsed for (s <- allSources; unit <- getUnit(s)) { - checkForMoreWork(NoPosition) + // checkForMoreWork(NoPosition) // disabled, as any work done here would be in an inconsistent state if (!unit.isUpToDate && unit.status != JustParsed) reset(unit) // reparse previously typechecked units. parseAndEnter(unit) serviceParsedEntered() @@ -609,7 +609,7 @@ class Global(settings: Settings, reporter: Reporter, projectName: String = "") debugLog("at pos "+pos+" was found: "+tree.getClass+" "+tree.pos.show) tree match { case Import(expr, _) => - debugLog("import found"+expr.tpe+" "+expr.tpe.members) + debugLog("import found"+expr.tpe+(if (expr.tpe == null) "" else " "+expr.tpe.members)) case _ => } if (stabilizedType(tree) ne null) { |