Rewrite the state machine to a class, rather than an object.

To avoid suprises in tree retyping, the instance of this
class is immediately upcase to
StateMachine[Promise[T], ExecContext].

Allow nested non-case classes. These pop up when
we use nested async calls.

Only look for duplicate names in the subtrees
traversed by AsyncTraverser.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala
index 14749ca..9a31337 100644
--- a/src/test/scala/scala/async/TreeInterrogation.scala
+++ b/src/test/scala/scala/async/TreeInterrogation.scala
@@ -57,11 +57,21 @@ object TreeInterrogation extends App {
     val tb = mkToolbox("-cp target/scala-2.10/classes -Xprint:all")
     val tree = tb.parse(
       """ import _root_.scala.async.AsyncId._
-        | async { val a = 0; val x = await(a) - 1; def foo(z: Any) = (a.toDouble, x.toDouble, z); foo(await(2)) }
+        | val state = 23
+        | val result: Any = "result"
+        | def resume(): Any = "resume"
+        | val res = async {
+        |   val f1 = async { state + 2 }
+        |   val x  = await(f1)
+        |   val y  = await(async { result })
+        |   val z  = await(async { resume() })
+        |   (x, y, z)
+        | }
+        | ()
         | """.stripMargin)
     println(tree)
     val tree1 = tb.typeCheck(tree.duplicate)
     println(cm.universe.show(tree1))
     println(tb.eval(tree))
   }
-}
\ No newline at end of file
+}