aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-07-07 09:35:05 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-07-07 09:40:44 +1000
commitf3f058991b207a07041672a7e119422d9054788d (patch)
tree490aec21bd028f8ff96b3b33ebcbe1ea3b76d993 /src
parent5aa390e7cd01c7564c2c78cd786f42801a3ee1f0 (diff)
downloadscala-async-f3f058991b207a07041672a7e119422d9054788d.tar.gz
scala-async-f3f058991b207a07041672a7e119422d9054788d.tar.bz2
scala-async-f3f058991b207a07041672a7e119422d9054788d.zip
Avoid compiler warning when awaiting Future[Unit]
During the ANF transform, we were generating a tree of the shape: { val temp: Unit = await(futureOfUnit) temp () } I tried to simplifiy this to avoid creating the temporary value, but this proved difficult as it would have required changes to the subsequent state machine transformation. Even replacing `temp` with `()` made the state machine transform harder. So for now, I've just inserted `temp.asInstanceOf[Unit]` to hide from the compiler warning. Fixes #74
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/scala/async/internal/AnfTransform.scala12
-rw-r--r--src/test/scala/scala/async/run/WarningsSpec.scala35
2 files changed, 46 insertions, 1 deletions
diff --git a/src/main/scala/scala/async/internal/AnfTransform.scala b/src/main/scala/scala/async/internal/AnfTransform.scala
index c722269..585f388 100644
--- a/src/main/scala/scala/async/internal/AnfTransform.scala
+++ b/src/main/scala/scala/async/internal/AnfTransform.scala
@@ -51,7 +51,17 @@ private[async] trait AnfTransform {
expr match {
case Apply(fun, args) if isAwait(fun) =>
val valDef = defineVal(name.await, expr, tree.pos)
- stats :+ valDef :+ atPos(tree.pos)(gen.mkAttributedStableRef(valDef.symbol)).setType(tree.tpe)
+ val ref = gen.mkAttributedStableRef(valDef.symbol).setType(tree.tpe)
+ val ref1 = if (ref.tpe =:= definitions.UnitTpe)
+ // https://github.com/scala/async/issues/74
+ // Use a cast to hide from "pure expression does nothing" error
+ //
+ // TODO avoid creating a ValDef for the result of this await to avoid this tree shape altogether.
+ // This will require some deeper changes to the later parts of the macro which currently assume regular
+ // tree structure around `await` calls.
+ gen.mkCast(ref, definitions.UnitTpe)
+ else ref
+ stats :+ valDef :+ atPos(tree.pos)(ref1)
case If(cond, thenp, elsep) =>
// if type of if-else is Unit don't introduce assignment,
diff --git a/src/test/scala/scala/async/run/WarningsSpec.scala b/src/test/scala/scala/async/run/WarningsSpec.scala
new file mode 100644
index 0000000..3a7843a
--- /dev/null
+++ b/src/test/scala/scala/async/run/WarningsSpec.scala
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
+ */
+
+package scala.async
+package run
+
+import org.junit.Test
+
+import scala.async.internal.AsyncId
+import scala.concurrent.Await
+import scala.concurrent.duration._
+import scala.language.{postfixOps, reflectiveCalls}
+
+
+class WarningsSpec {
+
+ @Test
+ // https://github.com/scala/async/issues/74
+ def noPureExpressionInStatementPositionWarning_t74() {
+ val tb = mkToolbox(s"-cp ${toolboxClasspath} -Xfatal-warnings")
+ // was: "a pure expression does nothing in statement position; you may be omitting necessary parentheses"
+ tb.eval(tb.parse {
+ """
+ | import scala.async.internal.AsyncId._
+ | async {
+ | if ("".isEmpty) {
+ | await(println("hello"))
+ | ()
+ | } else 42
+ | }
+ """.stripMargin
+ })
+ }
+}