Merge pull request #566 from Atry/Enable-AtomicThenDerivedThenComposed

Enable Searching.AtomicThenStackSafeDerivedThenComposedThenStackUnsafeDerived by default

Author: Atry

Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala

@@ -16,15 +16,15 @@ final class RaiiSpec extends AnyFreeSpec with Matchers {
   @inline
   private def jvmCatch[Domain](eh: => Domain !! Throwable)(
       failureHandler: Throwable => Domain
-  )(implicit shiftDsl: Dsl[Shift[Domain, Throwable], Domain, Throwable]): Domain = {
+  )(implicit shiftDsl: Dsl.Searching[Shift[Domain, Throwable], Domain, Throwable]): Domain = {
     val protectedContinuation: Domain !! Throwable =
       try {
         eh
       } catch {
         case NonFatal(e) =>
           return failureHandler(e)
       }
-    shiftDsl.cpsApply(Shift(protectedContinuation), failureHandler)
+    shiftDsl(Shift(protectedContinuation), failureHandler)
   }
 
   /** Exit the current scope then hang up

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

@@ -192,42 +192,44 @@ object scalaz {
   ): Dsl.Lift.OneStep[A, F[A]] =
     applicative.pure
 
-  implicit def scalazMonadTransformerDsl1[F[_[_], _], H[_], G[_], A, B](implicit
+  given [F[_[_], _], H[_], G[_], A, B](using
       monadTrans: MonadTrans[F],
       rest: ScalazTransformerDsl[H, G, A, B]
-  ): ScalazTransformerDsl[H, [X] =>> F[G, X], A, B] =
-    new ScalazTransformerDsl[H, [X] =>> F[G, X], A, B] {
+  ): Dsl.Atomic[Monadic[H[A]], F[G, B], A] =
+    Dsl.Atomic(new ScalazTransformerDsl[H, [X] =>> F[G, X], A, B] {
 
       def monad: Monad[[X] =>> F[G, X]] = monadTrans(rest.monad)
 
       def lift(fa: H[A]): F[G, A] = monadTrans.liftM(rest.lift(fa))(rest.monad)
 
-    }
+    })
 
-  implicit def scalazMonadTransformerDsl0[F[_[_], _], G[_], A, B](implicit
+  given [F[_[_], _], G[_], A, B](using
       monadTrans: MonadTrans[F],
       monad0: Monad[G]
-  ): ScalazTransformerDsl[G, [X] =>> F[G, X], A, B] =
-    new ScalazTransformerDsl[G, [X] =>> F[G, X], A, B] {
+  ): Dsl.Atomic[Monadic[G[A]], F[G, B], A] =
+    Dsl.Atomic(new ScalazTransformerDsl[G, [X] =>> F[G, X], A, B] {
       def monad = monadTrans(monad0)
 
       def lift(fa: G[A]): F[G, A] = monadTrans.liftM(fa)
 
-    }
+    })
 
-  implicit def scalazMonadicDsl[F[_], A, B](implicit bind: Bind[F]): Dsl[Monadic[F[A]], F[B], A] =
-    new Dsl[Monadic[F[A]], F[B], A] {
-      def cpsApply(keyword: Monadic[F[A]], handler: A => F[B]): F[B] = {
+  given [F[_], A, B](using
+      bind: Bind[F]
+  ): Dsl.Atomic[Monadic[F[A]], F[B], A] =
+    Dsl.Atomic[Monadic[F[A]], F[B], A] {
+      (keyword: Monadic[F[A]], handler: A => F[B]) =>
         bind.bind(Monadic.apply.flip(keyword))(handler)
-      }
     }
 
-  abstract class ScalazTransformerDsl[F[_], G[_], A, B] extends Dsl[Monadic[F[A]], G[B], A] {
+  abstract class ScalazTransformerDsl[F[_], G[_], A, B]
+      extends ((Monadic[F[A]], A => G[B]) => G[B]) {
     def monad: Monad[G]
 
     def lift(fa: F[A]): G[A]
 
-    final def cpsApply(keyword: Monadic[F[A]], handler: A => G[B]): G[B] = {
+    final def apply(keyword: Monadic[F[A]], handler: A => G[B]): G[B] = {
       monad.bind(lift(Monadic.apply.flip(keyword)))(handler)
     }
 

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

@@ -167,8 +167,9 @@ object AsynchronousIo {
     }
   }
 
-  implicit def asynchronousIoDsl[Value]: Dsl[AsynchronousIo[Value], Unit !! Throwable, Value] = { (keyword, handler) =>
-    keyword.start(_, completionHandler(handler))
-  }
+  given [Value]: Dsl.Atomic[AsynchronousIo[Value], Unit !! Throwable, Value] =
+    Dsl.Atomic { (keyword, handler) =>
+      keyword.start(_, completionHandler(handler))
+    }
 
 }

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

@@ -12,13 +12,13 @@ private trait AwaitJS { this: Await.type =>
   given [PromiseResult]
       : Dsl.IsKeyword[Await[js.Promise[PromiseResult]], PromiseResult] with {}
 
-  given [JsPromiseResult, That]: Dsl[Await[js.Promise[JsPromiseResult]], js.Promise[That], JsPromiseResult] =
-    Await.apply.liftCo[[X] =>> Dsl[X, js.Promise[That], JsPromiseResult]](_ `then` _)
+  given [JsPromiseResult, That]: Dsl.Atomic[Await[js.Promise[JsPromiseResult]], js.Promise[That], JsPromiseResult] =
+    Await.apply.liftCo[[X] =>> Dsl.Atomic[X, js.Promise[That], JsPromiseResult]](Dsl.Atomic(_ `then` _))
 
-  given [JsPromiseResult, That](using ExecutionContext): Dsl[Await[js.Promise[JsPromiseResult]], Future[That], JsPromiseResult] =
-    Await.apply.liftCo[[X] =>> Dsl[X, Future[That], JsPromiseResult]] { (promise, handler) =>
+  given [JsPromiseResult, That](using ExecutionContext): Dsl.Atomic[Await[js.Promise[JsPromiseResult]], Future[That], JsPromiseResult] =
+    Await.apply.liftCo[[X] =>> Dsl.Atomic[X, Future[That], JsPromiseResult]](Dsl.Atomic { (promise, handler) =>
       promise.toFuture.flatMap(handler)
-    }
+    })
 
   extension [FA, A](inline fa: FA)(using
       inline notKeyword: util.NotGiven[

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

@@ -120,17 +120,17 @@ object Await extends AwaitJS {
 
   given [FutureResult, That](using
       ExecutionContext
-  ): Dsl[Await[Future[FutureResult]], Future[That], FutureResult] =
-    _ flatMap _
+  ): Dsl.Atomic[Await[Future[FutureResult]], Future[That], FutureResult] = Dsl.Atomic(
+    _ flatMap _)
 
   // // TODO:
   // implicit def tailRecContinuationAwaitDsl[Value](implicit
   //     executionContext: ExecutionContext
-  // ): Dsl[Await[Value], TailRec[Unit] !! Throwable, Value]
+  // ): Dsl.Atomic[Await[Value], TailRec[Unit] !! Throwable, Value]
 
   given [Value](using
       ExecutionContext
-  ): Dsl[Await[Future[Value]], Unit !! Throwable, Value] = {
+  ): Dsl.Atomic[Await[Future[Value]], Unit !! Throwable, Value] = Dsl.Atomic {
     (keyword: Await[Future[Value]], handler: Value => Unit !! Throwable) =>
       !!.fromTryContinuation[Unit, Value](keyword.onComplete)(handler)
   }

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

@@ -45,14 +45,14 @@ object Each {
         Collection,
         Domain
     ](using
-        toViewDsl: Dsl.PolyCont[Each.ToView[ForYield], Domain, View[Element]]
-    ): Dsl.PolyCont[
+        toViewDsl: Dsl.Searching[Each.ToView[ForYield], Domain, View[Element]]
+    ): Dsl.Composed[
       Each.To[ForYield, Element, Collection],
       Domain,
       Collection
-    ] = { case (keyword, handler) =>
+    ] = Dsl.Composed { (keyword, handler) =>
       val factory = keyword.factory
-      toViewDsl.cpsApply(
+      toViewDsl(
         ToView(keyword.forYield),
         { view => handler(view.to(factory)) }
       )
@@ -364,14 +364,14 @@ object Each {
           Keyword,
           Value
         ],
-        polyCont: Dsl.PolyCont[
+        polyCont: Dsl.Searching[
           Keyword,
           Domain,
           Value
         ]
-    ): Dsl.PolyCont[Each.ToView[Comprehension], Domain, Value] = {
+    ): Dsl.Composed[Each.ToView[Comprehension], Domain, Value] = Dsl.Composed {
       (as, handler) =>
-        polyCont.cpsApply(toKeyword(as), handler)
+        polyCont(toKeyword(as), handler)
     }
   }
 
@@ -412,12 +412,12 @@ object Each {
         MappedValue
       ],
       factory: Factory[MappedElement, MappedValue],
-      blockDsl: Dsl.PolyCont[MappedKeyword, Domain, MappedValue]
-  ): Dsl.PolyCont[
+      blockDsl: Dsl.Searching[MappedKeyword, Domain, MappedValue]
+  ): Dsl.Composed[
     FlatMap[Each[Element], MappedKeyword],
     Domain,
     MappedValue
-  ] = {
+  ] = Dsl.Composed {
     case (
           FlatMap(sourceCollection, flatMapper: (Element @unchecked => MappedKeyword)),
           handler
@@ -428,7 +428,7 @@ object Each {
       ): Domain = {
         seqOps.headOption match {
           case Some(head) =>
-            blockDsl.cpsApply(
+            blockDsl(
               flatMapper(head),
               { mappedHead =>
                 loop(
@@ -456,12 +456,12 @@ object Each {
       MappedKeyword,
       Domain
   ](using
-      blockDsl: Dsl.PolyCont[MappedKeyword, Domain, Unit]
-  ): Dsl.PolyCont[
+      blockDsl: Dsl.Searching[MappedKeyword, Domain, Unit]
+  ): Dsl.Composed[
     FlatMap[Each[Element], MappedKeyword],
     Domain,
     Unit
-  ] = {
+  ] = Dsl.Composed {
     case (
           FlatMap(sourceCollection, flatMapper: (Element @unchecked => MappedKeyword)),
           handler
@@ -472,7 +472,7 @@ object Each {
       ): Domain = {
         seqOps.headOption match {
           case Some(head) =>
-            blockDsl.cpsApply(
+            blockDsl(
               flatMapper(head),
               { mappedHead =>
                 loop(

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

@@ -22,23 +22,23 @@ object FlatMap {
       MappedValue,
       Domain
   ](using
-      upstreamDsl: Dsl.PolyCont[Upstream, Domain, UpstreamValue],
-      nestedDsl: Dsl.PolyCont[Mapped, Domain, MappedValue]
-  ): Dsl.PolyCont[FlatMap[Upstream, Mapped], Domain, MappedValue] with {
-    def cpsApply(
+      upstreamDsl: Dsl.Searching[Upstream, Domain, UpstreamValue],
+      nestedDsl: Dsl.Searching[Mapped, Domain, MappedValue]
+  ): Dsl.Composed[FlatMap[Upstream, Mapped], Domain, MappedValue] = Dsl.Composed {
+    (
         keyword: FlatMap[Upstream, Mapped],
         handler: MappedValue => Domain
-    ): Domain = {
+    ) =>
       val FlatMap(upstream, flatMapper) = keyword
-      upstreamDsl.cpsApply(
+      upstreamDsl(
         upstream,
         { upstreamValue =>
           // The typer might erase the type of of parameter of the function
           // when the parameter is a reference to a local value, therefore,
           // we are unable to call `flatMapper` without a cast.
-          nestedDsl.cpsApply(flatMapper.asInstanceOf[UpstreamValue => Mapped](upstreamValue), handler)
+          nestedDsl(flatMapper.asInstanceOf[UpstreamValue => Mapped](upstreamValue), handler)
         }
       )
-    }
+    
   }
 }

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

@@ -14,10 +14,10 @@ object Get {
   given [S]: IsKeyword[Get[S], S] with {}
   def apply[S]: Get[S] = Dsl.Keyword.Opaque.Of(())
 
-  implicit def getDsl[S0, S <: S0, A]: Dsl[Get[S0], S => A, S0] = new Dsl[Get[S0], S => A, S0] {
-    def cpsApply(keyword: Get[S0], handler: S0 => S => A): S => A = { b =>
-      handler(b)(b)
+  given [S0, S <: S0, A]: Dsl.Atomic[Get[S0], S => A, S0] =
+    Dsl.Atomic[Get[S0], S => A, S0] {
+      (keyword: Get[S0], handler: S0 => S => A) => b =>
+        handler(b)(b)
     }
-  }
 
 }

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

@@ -4,28 +4,37 @@ import Dsl.IsKeyword
 import Dsl.cpsApply
 
 final case class If[+ConditionKeyword, +ThenKeyword, +ElseKeyword](
-  cond: ConditionKeyword,
-  thenp: ThenKeyword,
-  elsep: ElseKeyword) extends Dsl.Keyword.Trait
+    cond: ConditionKeyword,
+    thenp: ThenKeyword,
+    elsep: ElseKeyword
+) extends Dsl.Keyword.Trait
 
 object If {
   given [ConditionKeyword, ThenKeyword, ThenValue, ElseKeyword, ElseValue](using
-    IsKeyword[ThenKeyword, ThenValue],
-    IsKeyword[ElseKeyword, ElseValue],
-  ): IsKeyword[If[ConditionKeyword, ThenKeyword, ElseKeyword], ThenValue | ElseValue] with {}
-  given[ConditionKeyword, ThenKeyword, ElseKeyword, Domain, Value](
-    using
-    Dsl.PolyCont[ConditionKeyword, Domain, Boolean],
-    Dsl.PolyCont[ThenKeyword, Domain, Value],
-    Dsl.PolyCont[ElseKeyword, Domain, Value],
-  ): Dsl.PolyCont[If[ConditionKeyword, ThenKeyword, ElseKeyword], Domain, Value] with {
-    def cpsApply(keyword: If[ConditionKeyword, ThenKeyword, ElseKeyword], handler: Value => Domain): Domain = {
-      keyword.cond.cpsApply{
+      IsKeyword[ThenKeyword, ThenValue],
+      IsKeyword[ElseKeyword, ElseValue]
+  ): IsKeyword[
+    If[ConditionKeyword, ThenKeyword, ElseKeyword],
+    ThenValue | ElseValue
+  ] with {}
+  given [ConditionKeyword, ThenKeyword, ElseKeyword, Domain, Value](using
+      Dsl.Searching[ConditionKeyword, Domain, Boolean],
+      Dsl.Searching[ThenKeyword, Domain, Value],
+      Dsl.Searching[ElseKeyword, Domain, Value]
+  ): Dsl.Composed[If[
+    ConditionKeyword,
+    ThenKeyword,
+    ElseKeyword
+  ], Domain, Value] = Dsl.Composed {
+    (
+        keyword: If[ConditionKeyword, ThenKeyword, ElseKeyword],
+        handler: Value => Domain
+    ) =>
+      keyword.cond.cpsApply {
         case true =>
           keyword.thenp.cpsApply(handler)
         case false =>
           keyword.elsep.cpsApply(handler)
       }
-    }
   }
-}
+}