Added assert that deferring cases of askLoadedTyped and askParsedEntered are not called from within an ask, as this would cause a deadlock.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@24429 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

Author: odersky

src/compiler/scala/tools/nsc/interactive/Global.scala

@@ -86,7 +86,12 @@ class Global(settings: Settings, reporter: Reporter)
    */
   protected val toBeRemoved = new ArrayBuffer[AbstractFile] with SynchronizedBuffer[AbstractFile]
 
-  type ResponseMap = MultiHashMap[SourceFile, Response[Tree]]
+  class ResponseMap extends MultiHashMap[SourceFile, Response[Tree]] {
+    override def += (binding: (SourceFile, Set[Response[Tree]])) = {
+      assert(interruptsEnabled, "delayed operation within an ask")
+      super.+=(binding)
+    }
+  }
 
   /** A map that associates with each abstract file the set of responses that are waiting
    *  (via waitLoadedTyped) for the unit associated with the abstract file to be loaded and completely typechecked.