fixed bug in select, whe quit message was delivered before processing last sum

Author: rssh

build.sbt

@@ -9,7 +9,7 @@ resolvers += Resolver.sonatypeRepo("snapshots")
 
 resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
 
-scalacOptions ++= Seq("-unchecked","-deprecation", "-feature" /*,  "-Ymacro-debug-lite"  ,  "-Ydebug"  , "-Ylog:lambdalift" */ )
+scalacOptions ++= Seq("-unchecked","-deprecation", "-feature" /* ,   "-Ymacro-debug-lite"  ,  "-Ydebug"  , "-Ylog:lambdalift" */ )
 
 libraryDependencies <+= scalaVersion( "org.scala-lang" % "scala-reflect" % _ )
 

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

@@ -331,8 +331,8 @@ object SelectorBuilder
                     val termName = name.toTermName 
                     // when debug problems on later compilation steps, you can create freshName and see visually:
                     // is oldName steel leaked to later compilation phases.
-                    val newName = c.freshName(termName)
-                    //val newName = termName
+                    //val newName = c.freshName(termName)
+                    val newName = termName
                     val tpoa = clearCaseDefOwner(name, newName, if (tp.original.isEmpty) tp else tp.original)
                     val tpo = MacroUtil.skipAnnotation(c)( tpoa )
                     val param = ValDef(Modifiers(Flag.PARAM), newName, tpoa ,EmptyTree)

src/test/scala/gopher/channels/MacroSelectSuite.scala

@@ -157,11 +157,11 @@ class MacroSelectSuite extends FunSuite
    test("multiple readers for one write")  {
      import gopherApi._
      val ch = makeChannel[Int](10)
-     @volatile var x1 = 0
-     @volatile var x2 = 0
-     @volatile var x3 = 0
-     @volatile var x4 = 0
-     @volatile var x5 = 0
+     var x1 = 0
+     var x2 = 0
+     var x3 = 0
+     var x4 = 0
+     var x5 = 0
      val f1 = select.once{
                 case x:ch.read =>
                             {};
@@ -195,6 +195,31 @@ class MacroSelectSuite extends FunSuite
      assert(x1+x2+x3+x4+x5==1)
    }
 
+   test("fold in selector")  {
+    import gopherApi._
+    for(i <- 1 to 100) {
+     val ch = makeChannel[Int](10)
+     val back = makeChannel[Int]()
+     val quit = Promise[Boolean]()
+     val r = select.afold(0){ (x,s) =>
+               s match {
+                 case a:ch.read => back <~ a
+                                   x+a
+                 case q:Boolean if (q==quit.future.read) => CurrentFlowTermination.exit(x)
+               }
+             }
+     ch.awriteAll(1 to 10)
+     back.aforeach{ x =>
+       if (x==10) {
+         quit success true
+       }
+     }
+     val sum = Await.result(r, 1 second)
+     assert(sum==(1 to 10).sum)
+    }
+   }
+
+
    lazy val gopherApi = CommonTestObjects.gopherApi
 
 }