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, 11 deletions

diff --git a/src/main/scala/scala/async/TransformUtils.scala b/src/main/scala/scala/async/TransformUtils.scala
index 553211a..5b1fcbe 100644
--- a/src/main/scala/scala/async/TransformUtils.scala
+++ b/src/main/scala/scala/async/TransformUtils.scala
@@ -18,17 +18,18 @@ private[async] final case class TransformUtils[C <: Context](c: C) {
 
     def suffixedName(prefix: String) = newTermName(suffix(prefix))
 
-    val state        = suffixedName("state")
-    val result       = suffixedName("result")
-    val resume       = suffixedName("resume")
-    val execContext  = suffixedName("execContext")
-    val stateMachine = suffixedName("stateMachine")
-    val apply        = newTermName("apply")
-    val tr           = newTermName("tr")
-    val matchRes     = "matchres"
-    val ifRes        = "ifres"
-    val await        = "await"
-    val bindSuffix   = "$bind"
+    val state         = suffixedName("state")
+    val result        = suffixedName("result")
+    val resume        = suffixedName("resume")
+    val execContext   = suffixedName("execContext")
+    val stateMachine  = newTermName(fresh("stateMachine"))
+    val stateMachineT = stateMachine.toTypeName
+    val apply         = newTermName("apply")
+    val tr            = newTermName("tr")
+    val matchRes      = "matchres"
+    val ifRes         = "ifres"
+    val await         = "await"
+    val bindSuffix    = "$bind"
 
     def fresh(name: TermName): TermName = newTermName(fresh(name.toString))