diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-04-10 23:52:31 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-04-11 23:32:42 +0200 |
commit | 5a0b1918238cb385401f304b22132f51936d795b (patch) | |
tree | 3787f45b62cdf98912bf8ba7429bf6efeadf07e8 /src/test/scala | |
parent | 74beb1b751f6abf1775d6a8ec3eea4d63f3fd41f (diff) | |
download | scala-async-5a0b1918238cb385401f304b22132f51936d795b.tar.gz scala-async-5a0b1918238cb385401f304b22132f51936d795b.tar.bz2 scala-async-5a0b1918238cb385401f304b22132f51936d795b.zip |
Allow await in applications with multiple argument lists
Before, we levied an implementation restriction to prevent
this. As it turned out, that needlessly prevented use of
`await` in the receiver of a multi-param-list application.
This commit lifts the restriction altogether, and treats
such applications holistically, being careful to preserve the
left-to-right evaluation order of arguments in the translated
code.
- use `TreeInfo.Applied` and `Type#paramss` from `reflect.internal`
to get the info we need
- use the parameter name for the lifted argument val, rather than
`argN`
- encapsulate handling of by-name-ness and parameter names
in `mapArgumentss`
- test for evaluation order preservation
Diffstat (limited to 'src/test/scala')
-rw-r--r-- | src/test/scala/scala/async/TreeInterrogation.scala | 17 | ||||
-rw-r--r-- | src/test/scala/scala/async/run/anf/AnfTransformSpec.scala | 76 |
2 files changed, 65 insertions, 28 deletions
diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala index 4d611e5..deaee03 100644 --- a/src/test/scala/scala/async/TreeInterrogation.scala +++ b/src/test/scala/scala/async/TreeInterrogation.scala @@ -71,17 +71,14 @@ object TreeInterrogation extends App { val tb = mkToolbox("-cp target/scala-2.10/classes -Xprint:flatten") import scala.async.Async._ val tree = tb.parse( - """ import scala.async.AsyncId._ - | async { - | val x = 1 - | val opt = Some("") - | await(0) - | val o @ Some(y) = opt - | - | { - | val o @ Some(y) = Some(".") - | } + """ import _root_.scala.async.AsyncId.{async, await} + | def foo[T](a0: Int)(b0: Int*) = s"a0 = $a0, b0 = ${b0.head}" + | val res = async { + | var i = 0 + | def get = async {i += 1; i} + | foo[Int](await(get))(await(get) :: Nil : _*) | } + | res | """.stripMargin) println(tree) val tree1 = tb.typeCheck(tree.duplicate) diff --git a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala index 41c13e0..7be6299 100644 --- a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala +++ b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala @@ -232,28 +232,68 @@ class AnfTransformSpec { } @Test - def awaitNotAllowedInNonPrimaryParamSection1() { - expectError("implementation restriction: await may only be used in the first parameter list.") { - """ - | import _root_.scala.async.AsyncId.{async, await} - | def foo(primary: Any)(i: Int) = i - | async { - | foo(???)(await(0)) - | } - """.stripMargin + def awaitInNonPrimaryParamSection1() { + import _root_.scala.async.AsyncId.{async, await} + def foo(a0: Int)(b0: Int) = s"a0 = $a0, b0 = $b0" + val res = async { + var i = 0 + def get = {i += 1; i} + foo(get)(get) + } + res mustBe "a0 = 1, b0 = 2" + } + + @Test + def awaitInNonPrimaryParamSection2() { + import _root_.scala.async.AsyncId.{async, await} + def foo[T](a0: Int)(b0: Int*) = s"a0 = $a0, b0 = ${b0.head}" + val res = async { + var i = 0 + def get = async {i += 1; i} + foo[Int](await(get))(await(get) :: await(async(Nil)) : _*) + } + res mustBe "a0 = 1, b0 = 2" + } + + @Test + def awaitInNonPrimaryParamSectionWithLazy1() { + import _root_.scala.async.AsyncId.{async, await} + def foo[T](a: => Int)(b: Int) = b + val res = async { + def get = async {0} + foo[Int](???)(await(get)) } + res mustBe 0 } @Test - def awaitNotAllowedInNonPrimaryParamSection2() { - expectError("implementation restriction: await may only be used in the first parameter list.") { - """ - | import _root_.scala.async.AsyncId.{async, await} - | def foo[T](primary: Any)(i: Int) = i - | async { - | foo[Int](???)(await(0)) - | } - """.stripMargin + def awaitInNonPrimaryParamSectionWithLazy2() { + import _root_.scala.async.AsyncId.{async, await} + def foo[T](a: Int)(b: => Int) = a + val res = async { + def get = async {0} + foo[Int](await(get))(???) + } + res mustBe 0 + } + + @Test + def awaitWithLazy() { + import _root_.scala.async.AsyncId.{async, await} + def foo[T](a: Int, b: => Int) = a + val res = async { + def get = async {0} + foo[Int](await(get), ???) + } + res mustBe 0 + } + + @Test + def awaitOkInReciever() { + import scala.async.AsyncId.{async, await} + class Foo { def bar(a: Int)(b: Int) = a + b } + async { + await(async(new Foo)).bar(1)(2) } } |