Moved the presentation compiler thread in its o...

Moved the presentation compiler thread in its own top-level class. This
allows to collect the presentation compiler instance when the thread is
not GCed, but the compiler should be discarded (for example, after a
shutdown request). Having the thread as an inner class keeps a reference
to the outer class. review by odersky.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
index 4a4808b28e..16a7b2377a 100644
--- a/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
+++ b/src/compiler/scala/tools/nsc/interactive/CompilerControl.scala
@@ -74,7 +74,7 @@ trait CompilerControl { self: Global =>
   /** The scheduler by which client and compiler communicate
    *  Must be initialized before starting compilerRunner
    */
-  protected val scheduler = new WorkScheduler
+  protected[interactive] val scheduler = new WorkScheduler
 
   /** The compilation unit corresponding to a source file
    *  if it does not yet exist creat a new one atomically
@@ -177,9 +177,12 @@ trait CompilerControl { self: Global =>
 
   /** Ask for a computation to be done quickly on the presentation compiler thread */
   def ask[A](op: () => A): A = scheduler doQuickly op
+}
 
   // ---------------- Interpreted exceptions -------------------
 
-  object FreshRunReq extends ControlThrowable
-  object ShutdownReq extends ControlThrowable
-}
+/** It has to stay top-level so that the PresentationCompilerThread may access it. */
+object FreshRunReq extends ControlThrowable
+
+/** It has to stay top-level so that the PresentationCompilerThread may access it. */
+object ShutdownReq extends ControlThrowable