Merge pull request #534 from Atry/task

Let Task support ToView.FromIterable

Author: Atry

domains-Continuation/src/main/scala/com/thoughtworks/dsl/domains/Continuation.scala

@@ -3,6 +3,7 @@ package domains
 
 import scala.util._
 import scala.util.control.NonFatal
+import com.thoughtworks.dsl.keywords.Pure
 
 type Continuation[R, +A] = (A => R) => R
 
@@ -21,7 +22,10 @@ object Continuation {
   def delay[R, A](a: () => A): R !! A = _(a())
 
   inline def apply[R, A](inline a: A): R !! A = { handler =>
-    reset(handler(a))
+    reset {
+      // !Pure ensures stack safety
+      handler(!Pure(a))
+    }
   }
 
   def toTryContinuation[LeftDomain, Value](

domains-Task/.jvm/src/test/scala/com/thoughtworks/dsl/domains/taskSpec.scala

@@ -9,20 +9,20 @@ import scala.language.implicitConversions
 import com.thoughtworks.dsl.keywords.{Using, ToView}
 import com.thoughtworks.dsl.domains._
 import com.thoughtworks.dsl.keywords.Shift
-import com.thoughtworks.dsl.keywords.Shift.given
 
 import scala.collection.mutable.ArrayBuffer
 import scala.util.control.TailCalls
 import scala.util.{Failure, Success}
 import org.scalatest.freespec.AsyncFreeSpec
 import org.scalatest.matchers.should.Matchers
 
-/** @author 杨博 (Yang Bo)
+/** @author
+  *   杨博 (Yang Bo)
   */
 final class taskSpec extends AsyncFreeSpec with Matchers {
 
   "tailRecurision" in Task.toFuture(Task {
-    def loop(i: Int = 0, accumulator: Int = 0): Task[Int] = *[Task] {
+    def loop(i: Int = 0, accumulator: Int = 0): Task[Int] = Task {
       if (i < 10000) {
         !Shift(loop(i + 1, accumulator + i))
       } else {
@@ -114,8 +114,8 @@ final class taskSpec extends AsyncFreeSpec with Matchers {
   "autoClose" in {
     val logs = ArrayBuffer.empty[Int]
 
-    // TODO: Re-implement Using to support `Task {}` instead of `*[Task]`
-    val task: Task[Unit] = *[Task] {
+    // TODO: Re-implement Using to support `Task {}` instead of `Task`
+    val task: Task[Unit] = Task {
 
       logs += 0
 
@@ -139,7 +139,7 @@ final class taskSpec extends AsyncFreeSpec with Matchers {
       })
 
       // TODO: Re-implement Using to support `Task{}`
-      !Shift(*[Task] {
+      !Shift(Task {
         logs += 3
 
         !Using(new AutoCloseable {
@@ -169,21 +169,24 @@ final class taskSpec extends AsyncFreeSpec with Matchers {
     }
 
     Task.toFuture(task).map { _ =>
-      logs should be(ArrayBuffer(0, 10, 11, 12, 3, 40, 41, 42, 6, 52, 51, 50, 7, 22, 21, 20))
+      logs should be(
+        ArrayBuffer(0, 10, 11, 12, 3, 40, 41, 42, 6, 52, 51, 50, 7, 22, 21, 20)
+      )
     }
 
   }
 
   // Task.join is not supported any more
   "nested seq of task" ignore {
 
-    def composeTask(t0: Task[Seq[Task[Seq[Task[Seq[Task[Seq[Float]]]]]]]]): Task[Seq[Seq[Seq[Seq[Float]]]]] = {
-      // TODO: remove explicit type parameters when https://github.com/scala/bug/issues/11068 is fixed
-      *[Task]/*.join*/ apply Seq {
+    def composeTask(
+        t0: Task[Seq[Task[Seq[Task[Seq[Task[Seq[Float]]]]]]]]
+    ): Task[Seq[Seq[Seq[Seq[Float]]]]] = {
+      Task /*.join*/ apply Seq {
         val t1 = !ToView.FromIterable(!Shift(t0))
-        !Shift(*[Task]/*.join*/ apply Seq {
+        !Shift(Task /*.join*/ apply Seq {
           val t2 = !ToView.FromIterable(!Shift(t1))
-          !Shift(*[Task]/*.join*/ apply Seq {
+          !Shift(Task /*.join*/ apply Seq {
             val t3 = !ToView.FromIterable(!Shift(t2))
             !Shift(t3)
           })

domains-Task/src/main/scala/com/thoughtworks/dsl/domains/Task.scala

@@ -2,6 +2,8 @@ package com.thoughtworks.dsl
 package domains
 
 import com.thoughtworks.dsl.domains.Continuation, Continuation.!!
+import com.thoughtworks.dsl.keywords.Pure
+import com.thoughtworks.dsl.keywords.Suspend
 import com.thoughtworks.dsl.keywords.Shift
 import com.thoughtworks.dsl.reset, reset._
 
@@ -78,7 +80,10 @@ object Task extends TaskPlatformSpecificFunctions {
   def delay[A](f: () => A): Task[A] = _(f())
 
   inline def apply[A](inline a: A): Task[A] = { handler =>
-    reset(handler(a))
+    reset {
+      // !Pure ensures stack safety
+      handler(!Pure(a))
+    }
   }
 
   /** Returns a task that does nothing but let the succeeding tasks run on `executionContext`
@@ -90,7 +95,7 @@ object Task extends TaskPlatformSpecificFunctions {
     *          import org.scalatest.Assertion
     *          import scala.concurrent.ExecutionContext
     *          import com.thoughtworks.dsl.keywords.Shift
-    *          def myTask: Task[Assertion] = *[Task] {
+    *          def myTask: Task[Assertion] = Task {
     *            val originalThread = Thread.currentThread
     *            !Shift(Task.switchExecutionContext(ExecutionContext.global))
     *            Thread.currentThread should not be originalThread

keywords-Await/src/main/scala/com/thoughtworks/dsl/keywords/Await.scala

@@ -36,7 +36,7 @@ import scala.language.implicitConversions
   * {{{
   * import com.thoughtworks.dsl.domains.Task
   * import com.thoughtworks.dsl.keywords.Await
-  * val myTask = *[Task] {
+  * val myTask = Task {
   *   !Await(myFuture42)
   * }
   * }}}
@@ -45,7 +45,7 @@ import scala.language.implicitConversions
   * [[domains.task.Task.toFuture]].
   *
   * {{{
-  * val myAssertionTask = *[Task] {
+  * val myAssertionTask = Task {
   *   !Shift(myTask) should be(42)
   * }
   * Task.toFuture(myAssertionTask)