aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/scala/async/internal/TransformUtils.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-27 13:15:43 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-07-27 13:15:43 +1000
commit80aaf18d5111322baee73dad30eb0a81cdd62314 (patch)
tree9b2f5219aca829a2f5d756bab5e196f99b120653 /src/main/scala/scala/async/internal/TransformUtils.scala
parent017928c43a6520c136d30af08d2bc3f441c2088a (diff)
downloadscala-async-80aaf18d5111322baee73dad30eb0a81cdd62314.tar.gz
scala-async-80aaf18d5111322baee73dad30eb0a81cdd62314.tar.bz2
scala-async-80aaf18d5111322baee73dad30eb0a81cdd62314.zip
Avoid masking user exception with ??? for Nothing typed expressions
Code like: val x = if (cond) throw new A else throw new B Was being transformed to: val ifRes = ??? if (cond) ifRes = throw new A else ifRes = throw new B val x = ifRes by way of the use of `gen.mkZero` which throws `???` if the requested type is `Nothing` This commit special cases `Nothing` typed expressions in a similar manner to `Unit` type expressions. The example above is now translated to: if (cond) throw new A else throw new B val x = throw new IllegalStateException() Fixes #120
Diffstat (limited to 'src/main/scala/scala/async/internal/TransformUtils.scala')
-rw-r--r--src/main/scala/scala/async/internal/TransformUtils.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
index df958b8..547f980 100644
--- a/src/main/scala/scala/async/internal/TransformUtils.scala
+++ b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -151,6 +151,7 @@ private[async] trait TransformUtils {
val NonFatalClass = rootMirror.staticModule("scala.util.control.NonFatal")
val Async_await = asyncBase.awaitMethod(c.universe)(c.macroApplication.symbol).ensuring(_ != NoSymbol)
+ val IllegalStateExceptionClass = rootMirror.staticClass("java.lang.IllegalStateException")
}
// `while(await(x))` ... or `do { await(x); ... } while(...)` contain an `If` that loops;