Merge pull request #494 from Atry/cast-to-apply

Atry · web-flow · commit 27c8a41792fc · 2021-12-08T21:26:05.000-08:00
Rename cast to apply
diff --git a/Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala b/Dsl/src/main/scala/com/thoughtworks/dsl/Dsl.scala
@@ -515,9 +515,7 @@ object Dsl extends LowPriorityDsl0 {
         @inline def withValueType: Typed[Keyword, NewValue] = typedKeyword
     }
 
-    @inline def cast[Keyword, Value]: Keyword =:= Typed[Keyword, Value] = summon[Keyword =:= Typed[Keyword, Value]]
-
-    def apply[Keyword, Value](keyword: Keyword): Typed[Keyword, Value] = keyword
+    @inline def apply[Keyword, Value]: Keyword =:= Typed[Keyword, Value] = summon
 
   }
 
diff --git a/bangnotation/src/main/scala/com/thoughtworks/dsl/bangnotation.scala b/bangnotation/src/main/scala/com/thoughtworks/dsl/bangnotation.scala
@@ -65,7 +65,7 @@ object bangnotation {
       val reifiedTerm = KeywordTree(bodyTerm).keywordTerm
         reifiedTerm.usingExpr { [K] => (k: quoted.Expr[K]) => (tk: quoted.Type[K]) =>
           given quoted.Type[K] = tk
-          '{Dsl.Typed.cast[K, V]($k)}: quoted.Expr[_]
+          '{Dsl.Typed[K, V]($k)}: quoted.Expr[_]
         }
       }
 
@@ -703,7 +703,7 @@ object bangnotation {
         valueType/*.widenTermRefByName*/.usingType { [A] => (ta: quoted.Type[A]) =>
           given quoted.Type[A] = ta
           '{
-            keywords.Pure.cast[A](${term.asExprOf[A]})
+            keywords.Pure[A](${term.asExprOf[A]})
           }.asTerm
         }
       }
diff --git a/comprehension/src/main/scala/com/thoughtworks/dsl/comprehension.scala b/comprehension/src/main/scala/com/thoughtworks/dsl/comprehension.scala
@@ -26,7 +26,7 @@ extension [Keyword, Value](keyword: Keyword)
   )(
       mapper: Value => MappedValue
   ): FlatMap[Keyword, Value, Pure[MappedValue]] =
-    FlatMap(keyword, Pure.cast.liftCo(mapper))
+    FlatMap(keyword, Pure.apply.liftCo(mapper))
 
   @inline def flatMap[Mapped, MappedValue](
       using /*erased*/ AsKeyword.FromKeyword[Keyword, Value]
diff --git a/domains-scalaz/src/main/scala/com/thoughtworks/dsl/domains/scalaz.scala b/domains-scalaz/src/main/scala/com/thoughtworks/dsl/domains/scalaz.scala
@@ -218,7 +218,7 @@ object scalaz {
   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] = {
-        bind.bind(Monadic.cast.flip(keyword))(handler)
+        bind.bind(Monadic.apply.flip(keyword))(handler)
       }
     }
 
@@ -228,7 +228,7 @@ object scalaz {
     def lift(fa: F[A]): G[A]
 
     final def cpsApply(keyword: Monadic[F, A], handler: A => G[B]): G[B] = {
-      monad.bind(lift(Monadic.cast.flip(keyword)))(handler)
+      monad.bind(lift(Monadic.apply.flip(keyword)))(handler)
     }
 
   }
diff --git a/keywords-Await/src/main/scala/com/thoughtworks/dsl/keywords/Await.scala b/keywords-Await/src/main/scala/com/thoughtworks/dsl/keywords/Await.scala
@@ -109,17 +109,15 @@ import scala.language.implicitConversions
   */
 opaque type Await[Result] = concurrent.Future[Result]
 object Await {
-  extension [Result](keyword: Await[Result]) def future: concurrent.Future[Result] = keyword
-  def apply[Result](future: concurrent.Future[Result]): Await[Result] = future
-  @inline def cast[Result]: concurrent.Future[Result] <:< Await[Result] = implicitly
+  @inline def apply[Result]: concurrent.Future[Result] =:= Await[Result] = summon
   given [Result]: AsKeyword.FromKeyword[Await[Result], Result] with {}
 
   implicit def streamAwaitDsl[Value, That](implicit
       executionContext: ExecutionContext
   ): Dsl[Await[Value], Stream[Future[That]], Value] =
     new Dsl[Await[Value], Stream[Future[That]], Value] {
       def cpsApply(keyword: Await[Value], handler: Value => Stream[Future[That]]): Stream[Future[That]] = {
-        val futureOfStream = keyword.future.map(handler)
+        val futureOfStream = keyword.map(handler)
         new Stream.Cons(futureOfStream.flatMap(_.head), result(futureOfStream, Duration.Inf).tail)
       }
     }
@@ -129,7 +127,7 @@ object Await {
   ): Dsl[Await[Value], Future[That], Value] =
     new Dsl[Await[Value], Future[That], Value] {
       def cpsApply(keyword: Await[Value], handler: Value => Future[That]): Future[That] = {
-        keyword.future.flatMap(handler)
+        keyword.flatMap(handler)
       }
     }
 
@@ -143,7 +141,7 @@ object Await {
   ): Dsl[Await[Value], Unit !! Throwable, Value] =
     new Dsl[Await[Value], Unit !! Throwable, Value] {
       def cpsApply(keyword: Await[Value], handler: Value => Unit !! Throwable): Unit !! Throwable =
-        !!.fromTryContinuation[Unit, Value](keyword.future.onComplete)(handler)
+        !!.fromTryContinuation[Unit, Value](keyword.onComplete)(handler)
     }
 
   given [Value]: AsKeyword.FromKeywordSubtype[Future[Value], Await[Value], Value] with {}
diff --git a/keywords-ForYield/src/main/scala/com/thoughtworks/dsl/keywords/ForYield.scala b/keywords-ForYield/src/main/scala/com/thoughtworks/dsl/keywords/ForYield.scala
@@ -8,5 +8,5 @@ import Dsl.Typed
 
 opaque type ForYield[Keyword, AsKeyword.FromKeyword, OutputValue] = Dsl.Typed[Keyword, AsKeyword.FromKeyword]
 object ForYield {
-  @inline def cast[Keyword, AsKeyword.FromKeyword, OutputValue]: Dsl.Typed[Keyword, AsKeyword.FromKeyword] <:< ForYield[Keyword, AsKeyword.FromKeyword, OutputValue] = implicitly
+  @inline def apply[Keyword, AsKeyword.FromKeyword, OutputValue]: Dsl.Typed[Keyword, AsKeyword.FromKeyword] =:= ForYield[Keyword, AsKeyword.FromKeyword, OutputValue] = summon
 }
diff --git a/keywords-In/src/main/scala/com/thoughtworks/dsl/keywords/In.scala b/keywords-In/src/main/scala/com/thoughtworks/dsl/keywords/In.scala
@@ -3,10 +3,9 @@ package keywords
 import Dsl.AsKeyword
 import Dsl.Typed
 
-opaque type In[Element] <: Any = Iterable[Element]
+opaque type In[Element] = Iterable[Element]
 object In {
-  @inline def cast[Element]: Iterable[Element] <:< In[Element] = implicitly
-  def apply[Element](iterable: Iterable[Element]): In[Element] = iterable
+  @inline def apply[Element]: Iterable[Element] =:= In[Element] = summon
 
   given [Element]: AsKeyword.FromKeyword[In[Element], Element] with {}
 
diff --git a/keywords-Monadic/src/main/scala/com/thoughtworks/dsl/keywords/Monadic.scala b/keywords-Monadic/src/main/scala/com/thoughtworks/dsl/keywords/Monadic.scala
@@ -18,8 +18,7 @@ import scala.language.implicitConversions
 opaque type Monadic[Functor[_], Value] <: Any = Functor[Value]
 
 object Monadic {
-  @inline def cast[Functor[_], Value]: Functor[Value] =:= Monadic[Functor, Value] = implicitly
-  @inline def apply[Functor[_], Value](f: Functor[Value]): Monadic[Functor, Value] = f
+  @inline def apply[Functor[_], Value]: Functor[Value] =:= Monadic[Functor, Value] = summon
 
   given [Functor[_], Value]: AsKeyword.FromKeyword[Monadic[Functor, Value], Value] with {}
 
diff --git a/keywords-Pure/src/main/scala/com/thoughtworks/dsl/keywords/Pure.scala b/keywords-Pure/src/main/scala/com/thoughtworks/dsl/keywords/Pure.scala
@@ -12,6 +12,5 @@ object Pure {
   }
 
   given [PureValue]: AsKeyword.FromKeyword[Pure[PureValue], PureValue] with {}
-  @inline def cast[Value]: Value =:= Pure[Value] = summon[Value =:= Pure[Value]]
-  def apply[Value](value: Value): Pure[Value] = value
+  @inline def apply[Value]: Value =:= Pure[Value] = summon[Value =:= Pure[Value]]
 }
diff --git a/keywords-Return/src/main/scala/com/thoughtworks/dsl/keywords/Return.scala b/keywords-Return/src/main/scala/com/thoughtworks/dsl/keywords/Return.scala
@@ -15,13 +15,10 @@ import Dsl.Typed
   */
 opaque type Return[ReturnValue] = ReturnValue
 object Return {
-  @inline def cast[ReturnValue]: ReturnValue <:< Return[ReturnValue] = implicitly
+  @inline def apply[ReturnValue]: ReturnValue =:= Return[ReturnValue] = summon
 
-  @inline def apply[ReturnValue]: ReturnValue =:= Return[ReturnValue] = summon[ReturnValue =:= Return[ReturnValue]]
   given [ReturnValue]: AsKeyword.FromKeyword[Return[ReturnValue], Nothing] with {}
 
-  extension [ReturnValue](keyword: Return[ReturnValue]) def returnValue: ReturnValue = keyword
-
   given [ReturnValue, Domain](using
       lift: Lift[ReturnValue, Domain]
   ): Dsl[Return[ReturnValue], Domain, Nothing] with {
@@ -33,7 +30,7 @@ object Return {
   implicit def returnDsl[ReturnValue, Domain >: ReturnValue]: Dsl[Return[ReturnValue], Domain, Nothing] =
     new Dsl[Return[ReturnValue], Domain, Nothing] {
       def cpsApply(keyword: Return[ReturnValue], handler: Nothing => Domain): Domain = {
-        keyword.returnValue
+        keyword
       }
     }
 }
diff --git a/keywords-Shift/src/main/scala/com/thoughtworks/dsl/keywords/Shift.scala b/keywords-Shift/src/main/scala/com/thoughtworks/dsl/keywords/Shift.scala
@@ -22,7 +22,7 @@ private[keywords] trait LowPriorityShift1 {
   implicit def stackUnsafeShiftDsl[Domain, Value]: Dsl[Shift[Domain, Value], Domain, Value] =
     new Dsl[Shift[Domain, Value], Domain, Value] {
       def cpsApply(shift: Shift[Domain, Value], handler: Value => Domain) =
-        shift.continuation(handler)
+        Shift.apply.flip(shift)(handler)
     }
 
 }
@@ -59,7 +59,7 @@ object Shift extends LowPriorityShift0 {
   implicit def tailRecShiftDsl[R, Value]: SameDomainStackSafeShiftDsl[TailRec[R], Value] =
     new SameDomainStackSafeShiftDsl[TailRec[R], Value] {
       def cpsApply(keyword: Shift[TailRec[R], Value], handler: Value => TailRec[R]): TailRec[R] = {
-        shiftTailRec(keyword.continuation, handler)
+        shiftTailRec(keyword, handler)
       }
     }
 
@@ -105,7 +105,7 @@ object Shift extends LowPriorityShift0 {
           keyword: Shift[LeftDomain !! Throwable, Value],
           handler: Value => LeftDomain !! Throwable
       ): !![LeftDomain, Throwable] =
-        suspend(keyword.continuation, handler)
+        suspend(keyword, handler)
     }
 
   private def flatMapTrampoline[LeftDomain, RightDomain, Value](
@@ -139,13 +139,11 @@ object Shift extends LowPriorityShift0 {
           keyword: Shift[!![LeftDomain, Throwable], Value],
           handler: Value => !![!![LeftDomain, Throwable], RightDomain]
       ): !![!![LeftDomain, Throwable], RightDomain] =
-        taskFlatMap(keyword.continuation, handler)
+        taskFlatMap(keyword, handler)
     }
 
   private[keywords] type !![R, +A] = (A => R) => R
 
-  def apply[R, A](continuation: R !! A): Shift[R, A] = continuation
-
-  extension [R, A](shift: Shift[R, A]) def continuation: R !! A = shift
+  def apply[R, A]: (R !! A) =:= Shift[R, A] = summon
 
 }
diff --git a/keywords-Suspend/src/main/scala/com/thoughtworks/dsl/keywords/Suspend.scala b/keywords-Suspend/src/main/scala/com/thoughtworks/dsl/keywords/Suspend.scala
@@ -6,8 +6,7 @@ import Dsl.cpsApply
 
 opaque type Suspend[Keyword] = () => Keyword
 object Suspend {
-  @inline def cast[Keyword]: (() => Keyword) =:= Suspend[Keyword] = implicitly
-  def apply[Keyword, Value](keywordFunction: () => Keyword): Suspend[Keyword] = keywordFunction
+  @inline def apply[Keyword]: (() => Keyword) =:= Suspend[Keyword] = summon
 
   given[Upstream, UpstreamValue](using upstreamIsKeyword: => AsKeyword.FromKeyword[Upstream, UpstreamValue]): AsKeyword.FromKeyword[Suspend[Upstream], UpstreamValue] with {}
 
diff --git a/keywords-Using/src/main/scala/com/thoughtworks/dsl/keywords/Using.scala b/keywords-Using/src/main/scala/com/thoughtworks/dsl/keywords/Using.scala
@@ -67,7 +67,7 @@ object Using {
     */
   def scopeExit(r: ScopeExitHandler) = r
 
-  def apply[R <: AutoCloseable](r: R): Using[R] = r
+  def apply[R <: AutoCloseable]: R =:= Using[R] = summon
 
   given [
       R <: AutoCloseable,
diff --git a/keywords-Yield/src/main/scala/com/thoughtworks/dsl/keywords/Yield.scala b/keywords-Yield/src/main/scala/com/thoughtworks/dsl/keywords/Yield.scala
@@ -52,14 +52,14 @@ private[keywords] trait LowPriorityYield3 {
       : Dsl[From[FromCollection], Iterator[A], Unit] =
     new Dsl[From[FromCollection], Iterator[A], Unit] {
       def cpsApply(keyword: From[FromCollection], generateTail: Unit => Iterator[A]): Iterator[A] = {
-        keyword.elements.toIterator ++ generateTail(())
+        From.apply.flip(keyword).toIterator ++ generateTail(())
       }
     }
 
   implicit def iteratorYieldDsl[A, B >: A]: Dsl[Yield[A], Iterator[B], Unit] =
     new Dsl[Yield[A], Iterator[B], Unit] {
       def cpsApply(keyword: Yield[A], generateTail: Unit => Iterator[B]): Iterator[B] = {
-        Iterator.single(keyword.element) ++ generateTail(())
+        Iterator.single(Yield.apply.flip(keyword)) ++ generateTail(())
       }
     }
 
@@ -74,15 +74,15 @@ private[keywords] trait LowPriorityYield1 extends LowPriorityYield3 {
   ]]: Dsl[From[FromCollection], Collection[A], Unit] =
     new Dsl[From[FromCollection], Collection[A], Unit] {
       def cpsApply(keyword: From[FromCollection], generateTail: Unit => Collection[A]): Collection[A] = {
-        keyword.elements.toIterable ++: generateTail(())
+        From.apply.flip(keyword).toIterable ++: generateTail(())
       }
     }
 
   implicit def seqYieldDsl[A, B >: A, Collection[+X] <: SeqOps[X, Collection, Collection[X]]]
       : Dsl[Yield[A], Collection[B], Unit] =
     new Dsl[Yield[A], Collection[B], Unit] {
       def cpsApply(keyword: Yield[A], generateTail: Unit => Collection[B]): Collection[B] = {
-        keyword.element +: generateTail(())
+        Yield.apply.flip(keyword) +: generateTail(())
       }
     }
 }
@@ -91,12 +91,7 @@ private[keywords] trait LowPriorityYield0 extends LowPriorityYield1
 object Yield extends LowPriorityYield0 {
 
   given [Element]: AsKeyword.FromKeyword[Yield[Element], Unit] with {}
-  def cast[Element]: Element <:< Yield[Element] = implicitly
-  extension [Element](keyword: Yield[Element])
-    def element: Element = keyword
-
-  def apply[Element](element: Element): Yield[Element] = cast(element)
-
+  def apply[Element]: Element =:= Yield[Element] = summon
   def apply[A](element0: A, element1: A, elements: A*) = {
     From(element0 +: element1 +: elements)
   }
@@ -105,9 +100,7 @@ object Yield extends LowPriorityYield0 {
   object From {
     given [FromCollection <: TraversableOnce[_]]: AsKeyword.FromKeyword[From[FromCollection], Unit] with {}
 
-    def apply[FromCollection <: TraversableOnce[_]](elements: FromCollection): From[FromCollection] = elements
-    extension [FromCollection <: TraversableOnce[_]](keyword: From[FromCollection])
-      def elements: FromCollection = keyword
+    def apply[FromCollection <: TraversableOnce[_]]: FromCollection =:= From[FromCollection] = summon
 
   }
 

Original file line number	Diff line number	Diff line change
`@@ -515,9 +515,7 @@ object Dsl extends LowPriorityDsl0 {`
`515`	`515`	`@inline def withValueType: Typed[Keyword, NewValue] = typedKeyword`
`516`	`516`	`}`
`517`	`517`
`518`		`- @inline def cast[Keyword, Value]: Keyword =:= Typed[Keyword, Value] = summon[Keyword =:= Typed[Keyword, Value]]`
`519`		`-`
`520`		`- def apply[Keyword, Value](keyword: Keyword): Typed[Keyword, Value] = keyword`
	`518`	`+ @inline def apply[Keyword, Value]: Keyword =:= Typed[Keyword, Value] = summon`
`521`	`519`
`522`	`520`	`}`
`523`	`521`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ object bangnotation {`
`65`	`65`	`val reifiedTerm = KeywordTree(bodyTerm).keywordTerm`
`66`	`66`	`reifiedTerm.usingExpr { [K] => (k: quoted.Expr[K]) => (tk: quoted.Type[K]) =>`
`67`	`67`	`given quoted.Type[K] = tk`
`68`		`- '{Dsl.Typed.cast[K, V]($k)}: quoted.Expr[_]`
	`68`	`+ '{Dsl.Typed[K, V]($k)}: quoted.Expr[_]`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`@@ -703,7 +703,7 @@ object bangnotation {`
`703`	`703`	`valueType/.widenTermRefByName/.usingType { [A] => (ta: quoted.Type[A]) =>`
`704`	`704`	`given quoted.Type[A] = ta`
`705`	`705`	`'{`
`706`		`- keywords.Pure.cast[A](${term.asExprOf[A]})`
	`706`	`+ keywords.Pure[A](${term.asExprOf[A]})`
`707`	`707`	`}.asTerm`
`708`	`708`	`}`
`709`	`709`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ object scalaz {`
`218`	`218`	`implicit def scalazMonadicDsl[F[_], A, B](implicit bind: Bind[F]): Dsl[Monadic[F, A], F[B], A] =`
`219`	`219`	`new Dsl[Monadic[F, A], F[B], A] {`
`220`	`220`	`def cpsApply(keyword: Monadic[F, A], handler: A => F[B]): F[B] = {`
`221`		`- bind.bind(Monadic.cast.flip(keyword))(handler)`
	`221`	`+ bind.bind(Monadic.apply.flip(keyword))(handler)`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
`@@ -228,7 +228,7 @@ object scalaz {`
`228`	`228`	`def lift(fa: F[A]): G[A]`
`229`	`229`
`230`	`230`	`final def cpsApply(keyword: Monadic[F, A], handler: A => G[B]): G[B] = {`
`231`		`- monad.bind(lift(Monadic.cast.flip(keyword)))(handler)`
	`231`	`+ monad.bind(lift(Monadic.apply.flip(keyword)))(handler)`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ import Dsl.Typed`
`8`	`8`
`9`	`9`	`opaque type ForYield[Keyword, AsKeyword.FromKeyword, OutputValue] = Dsl.Typed[Keyword, AsKeyword.FromKeyword]`
`10`	`10`	`object ForYield {`
`11`		`- @inline def cast[Keyword, AsKeyword.FromKeyword, OutputValue]: Dsl.Typed[Keyword, AsKeyword.FromKeyword] <:< ForYield[Keyword, AsKeyword.FromKeyword, OutputValue] = implicitly`
	`11`	`+ @inline def apply[Keyword, AsKeyword.FromKeyword, OutputValue]: Dsl.Typed[Keyword, AsKeyword.FromKeyword] =:= ForYield[Keyword, AsKeyword.FromKeyword, OutputValue] = summon`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,5 @@ object Pure {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`given [PureValue]: AsKeyword.FromKeyword[Pure[PureValue], PureValue] with {}`
`15`		`- @inline def cast[Value]: Value =:= Pure[Value] = summon[Value =:= Pure[Value]]`
`16`		`- def apply[Value](value: Value): Pure[Value] = value`
	`15`	`+ @inline def apply[Value]: Value =:= Pure[Value] = summon[Value =:= Pure[Value]]`
`17`	`16`	`}`