Refactor the analyzers to a seprarate file.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index 645f3f7..546445a 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -66,12 +66,13 @@ abstract class AsyncBase {
     import Flag._
 
     val builder = new ExprBuilder[c.type, futureSystem.type](c, self.futureSystem)
+    val anaylzer = new AsyncAnalysis[c.type](c)
 
     import builder.defn._
     import builder.name
     import builder.futureSystemOps
 
-    builder.reportUnsupportedAwaits(body.tree)
+    anaylzer.reportUnsupportedAwaits(body.tree)
 
     // Transform to A-normal form:
     //  - no await calls in qualifiers or arguments,
@@ -86,7 +87,7 @@ abstract class AsyncBase {
     // states of our generated state machine, e.g. a value assigned before
     // an `await` and read afterwards.
     val renameMap: Map[Symbol, TermName] = {
-      builder.valDefsUsedInSubsequentStates(anfTree).map {
+      anaylzer.valDefsUsedInSubsequentStates(anfTree).map {
         vd =>
           (vd.symbol, builder.name.fresh(vd.name))
       }.toMap