Merged revisions 24689 via svnmerge from

https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r24689 | dragos | 2011-04-05 18:19:45 +0200 (Tue, 05 Apr 2011) | 3 lines

  Wrapped exceptions coming from calls to 'ask' in a FailedException.
This allows to get a stack trace from both the presentation compiler
thread and the calling thread. review by odersky. ........

1 files changed, 6 insertions, 2 deletions

diff --git a/src/compiler/scala/tools/nsc/util/InterruptReq.scala b/src/compiler/scala/tools/nsc/util/InterruptReq.scala
index e7c05beb65..8c1ce02e06 100644
--- a/src/compiler/scala/tools/nsc/util/InterruptReq.scala
+++ b/src/compiler/scala/tools/nsc/util/InterruptReq.scala
@@ -1,6 +1,8 @@
 package scala.tools.nsc
 package util
 
+import interactive.AskException
+
 /** A class of work items to be used in interrupt requests.
  */
 abstract class InterruptReq {
@@ -24,12 +26,14 @@ abstract class InterruptReq {
     notify()
   }
 
-  /** To be called from interrupting client to get result fo interrupt */
+  /** To be called from interrupting client to get result for interrupt */
   def getResult(): R = synchronized {
     while (result.isEmpty) wait()
     result.get match {
       case Left(res) => res
-      case Right(t) => throw t
+      case Right(t) => throw new FailedInterrupt(t)
     }
   }
 }
+
+class FailedInterrupt(cause: Throwable) extends Exception("Compiler exception during call to 'ask'", cause)