hof-async lifting inside select

Author: rssh

src/main/scala/gopher/channels/SelectorBuilder.scala

@@ -5,6 +5,7 @@ import scala.reflect.macros.blackbox.Context
 import scala.reflect.api._
 import gopher._
 import gopher.util._
+import gopher.goasync._
 import scala.concurrent._
 import scala.concurrent.duration._
 import scala.annotation.unchecked._
@@ -171,10 +172,11 @@ object SelectorBuilder
      val ftParam = ValDef(Modifiers(Flag.PARAM),ft,tq"gopher.FlowTermination[${weakTypeOf[T]}]",EmptyTree)
      val ecParam = ValDef(Modifiers(Flag.PARAM),ec,tq"scala.concurrent.ExecutionContext",EmptyTree)
      val nvaldefs = ecParam::ftParam::valdefs
+     val asyncBody = GoAsync.transformAsyncBody[T](c)(body)
      val nbody = q"""{
                       implicit val ${ft1} = ${ft}
                       implicit val ${ec1} = ${ec}
-                      scala.async.Async.async(${transformDelayedMacroses[T](c)(body)})(${ec})
+                      scala.async.Async.async(${transformDelayedMacroses[T](c)(asyncBody)})(${ec})
                      }
                   """
      val newTree = lastFun(nvaldefs,nbody)

src/test/scala/gopher/hofasyn/HofAsyncSuite.scala

@@ -113,6 +113,33 @@ class HofAsyncSuite extends FunSuite
       assert(r == 1)
    }
 
+   test("lift inside select") {
+     import gopherApi._
+     val ch1 = makeChannel[Int](10)
+     val ch2 = makeChannel[Int](10)
+     val quit = makeChannel[Boolean]()
+     val fin = go{
+       for(s <- select.forever) 
+         s match {
+           case x: ch1.read =>
+                     //System.err.println(s"received $x")
+                     for(i <- 1 to x) {
+                        //System.err.println(s"writing ${i*x}")
+                        ch2.write(i*x)
+                     }
+           case y: select.timeout if (y==(500.milliseconds)) =>
+                     System.err.println(s"timeout $y")
+           case z: quit.read =>
+                     select.exit(())
+         }
+     }
+     val fout = ch1.awrite(2)
+     val x1 = ch2.aread
+     val rx1 = Await.result(x1, 1 minute)
+     quit.awrite(true)
+     assert(rx1 == 2)
+   }
+
    lazy val gopherApi = CommonTestObjects.gopherApi
 
 }