Avoid hygiene problems by suffixing result/result/state.

Perhaps we should freshen them, but that will be a little awkward in our reify block.

1 files changed, 10 insertions, 4 deletions

diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index e8f5263..0a3bbbf 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -129,19 +129,25 @@ abstract class AsyncBase extends AsyncUtils {
 
 
         val prom: Expr[futureSystem.Prom[T]] = reify {
-          val result = futureSystemOps.createProm[T].splice
-          var state = 0
+          val result$async = futureSystemOps.createProm[T].splice
+          var state$async = 0
           futureSystemOps.future[Unit] {
             c.Expr[Unit](Block(
               localVarTrees :+ resumeFunTree,
               Apply(Ident(name.resume), List())))
           }(futureSystemOps.execContext).splice
-          result
+          result$async
         }
         val result = futureSystemOps.promiseToFuture(prom)
-        // println(s"${c.macroApplication} \nexpands to:\n ${result.tree}")
+//        println(s"${c.macroApplication} \nexpands to:\n ${result.tree}")
+//        val positions = result.tree.collect {
+//          case t => (t.toString.take(10).replaceAll("\n", "\\n"), t.pos)
+//        }
+//        println(positions.mkString("\n"))
+
         result
 
+
       case tree =>
         c.abort(c.macroApplication.pos, s"expression not supported by async: ${tree}")
     }