Merge pull request #573 from Atry/Reset.Default

Rename com.thoughtworks.reset to com.thoughtworks.macros.Reset.Default.reset

build.sbt

@@ -4,7 +4,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 lazy val Dsl =
   crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure).build()
 
-lazy val reset =
+lazy val `macros-Reset` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
     .dependsOn(
@@ -25,14 +25,14 @@ lazy val reset =
 lazy val `domains-Continuation` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
-    .dependsOn(reset)
+    .dependsOn(`macros-Reset`)
 
 lazy val `domains-Task` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
     .dependsOn(
       `keywords-Shift`,
-      reset,
+      `macros-Reset`,
       `domains-Continuation`,
       `keywords-Using` % Test,
       `keywords-Yield` % Test,
@@ -42,7 +42,7 @@ lazy val `domains-Task` =
 lazy val `keywords-Each` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
-    .dependsOn(Dsl, reset % Test, `keywords-Pure`, `keywords-FlatMap`)
+    .dependsOn(Dsl, `macros-Reset` % Test, `keywords-Pure`, `keywords-FlatMap`)
 
 lazy val `keywords-Pure` =
   crossProject(JSPlatform, JVMPlatform)
@@ -97,14 +97,14 @@ lazy val `keywords-Return` =
 lazy val `keywords-Get` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
-    .dependsOn(Dsl, reset % Test)
+    .dependsOn(Dsl, `macros-Reset` % Test)
 
 lazy val `keywords-Put` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
     .dependsOn(
       Dsl,
-      reset % Test,
+      `macros-Reset` % Test,
       `keywords-Get` % Test,
       `keywords-Yield` % Test,
       `keywords-Return` % Test
@@ -128,7 +128,7 @@ lazy val `keywords-Shift` =
 lazy val `keywords-Using` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
-    .dependsOn(Dsl, reset, `keywords-Shift`)
+    .dependsOn(Dsl, `macros-Reset`, `keywords-Shift`)
 
 lazy val `keywords-FlatMap` =
   crossProject(JSPlatform, JVMPlatform)
@@ -138,15 +138,15 @@ lazy val `keywords-FlatMap` =
 lazy val `keywords-NoneSafe` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
-    .dependsOn(Dsl, reset % Test, `keywords-Return`)
+    .dependsOn(Dsl, `macros-Reset` % Test, `keywords-Return`)
 
 lazy val `keywords-Await` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
     .dependsOn(
       Dsl,
       `domains-Continuation`,
-      reset % Test,
+      `macros-Reset` % Test,
       `domains-Task` % Test,
       `keywords-Get` % Test,
       `keywords-Return` % Test,
@@ -157,22 +157,22 @@ lazy val `keywords-Await` =
 lazy val `scala-async` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
-    .dependsOn(`keywords-Await`, reset)
+    .dependsOn(`keywords-Await`, `macros-Reset`)
 
 lazy val `keywords-Yield` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
     .dependsOn(
       Dsl,
-      reset % Test,
+      `macros-Reset` % Test,
       `keywords-Each` % Test,
       `keywords-Shift` % Test,
     )
 
 lazy val `keywords-Monadic` =
   crossProject(JSPlatform, JVMPlatform)
     .crossType(CrossType.Pure)
-    .dependsOn(Dsl, reset % Test)
+    .dependsOn(Dsl, `macros-Reset` % Test)
 
 organization in ThisBuild := "com.thoughtworks.dsl"
 
@@ -183,7 +183,7 @@ lazy val `domains-scalaz` =
     .crossType(CrossType.Pure)
     .dependsOn(
       Dsl,
-      reset % Test,
+      `macros-Reset` % Test,
       `keywords-Monadic`,
       `keywords-Return`,
       `keywords-TryCatch`,

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

@@ -4,6 +4,7 @@ package domains
 import scala.util._
 import scala.util.control.NonFatal
 import com.thoughtworks.dsl.keywords.Pure
+import com.thoughtworks.dsl.macros.Reset.Default.reset
 
 type Continuation[R, +A] = (A => R) => R
 

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

@@ -3,7 +3,7 @@ package domains
 
 import com.thoughtworks.dsl.keywords.{Shift, Yield}
 import com.thoughtworks.dsl.domains._, Continuation.!!
-import com.thoughtworks.dsl.reset, reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 
 import scala.util.control.NonFatal
 import org.scalatest.freespec.AnyFreeSpec

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

@@ -2,7 +2,7 @@ package com.thoughtworks.dsl
 package domains
 
 import Continuation.!!
-import com.thoughtworks.dsl.reset, reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import com.thoughtworks.dsl.keywords.{Using, Yield}
 import org.scalatest.Assertion
 import org.scalatest.freespec.AnyFreeSpec

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

@@ -1,7 +1,7 @@
 package com.thoughtworks.dsl
 package domains
 
-import com.thoughtworks.dsl.reset, reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import com.thoughtworks.dsl.Dsl.{!!}
 import org.scalatest.Assertion
 import scala.language.implicitConversions

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

@@ -5,7 +5,7 @@ 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._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 
 import scala.collection._
 import scala.collection.generic.CanBuildFrom
@@ -89,7 +89,7 @@ object Task extends TaskPlatformSpecificFunctions {
     *
     * @example All the code after a `!switchExecutionContext` should be executed on `executionContext`
     *          {{{
-    *          import com.thoughtworks.dsl.reset, reset._
+    *          import com.thoughtworks.dsl.macros.Reset.Default.*
     *          import com.thoughtworks.dsl.domains.Task
     *          import org.scalatest.Assertion
     *          import scala.concurrent.ExecutionContext

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

@@ -28,7 +28,7 @@ import scala.util.control.NonFatal
   *           import _root_.scalaz.Free.Trampoline
   *           import com.thoughtworks.dsl.keywords.Monadic
   *           import com.thoughtworks.dsl.domains.scalaz.given
-  *           import com.thoughtworks.dsl.reset
+  *           import com.thoughtworks.dsl.macros.Reset.Default.reset
   *           import com.thoughtworks.dsl.keywords.Monadic.unary_!
   *
   *           val trampoline3 = Trampoline.done(3)

domains-scalaz/src/test/scala/com/thoughtworks/dsl/domains/scalazSpec.scala

@@ -1,7 +1,7 @@
 package com.thoughtworks.dsl
 package domains
 
-import com.thoughtworks.dsl.reset, reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import com.thoughtworks.dsl.Dsl.!!
 import _root_.scalaz.\/
 import _root_.scalaz.\/-

keywords-Await/.jvm/src/test/scala/com/thoughtworks/dsl/keywords/AwaitSpec.scala

@@ -1,7 +1,7 @@
 package com.thoughtworks.dsl
 package keywords
 
-import reset.`*`
+import com.thoughtworks.dsl.macros.Reset.Default.`*`
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.model.Uri.Path

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

@@ -18,7 +18,7 @@ import scala.language.implicitConversions
   * @example
   *   Given a [[scala.concurrent.Future Future]]:
   * {{{
-  * import com.thoughtworks.dsl.reset, reset._
+  * import com.thoughtworks.dsl.macros.Reset.Default.*
   * import scala.concurrent.Future
   * val myFuture40 = Future {
   *   40
@@ -58,7 +58,7 @@ import scala.language.implicitConversions
   *   `!Await` can be used together with `try` / `catch` / `finally`.
   * {{{
   * import scala.concurrent.Future
-  * import com.thoughtworks.dsl.reset, reset._
+  * import com.thoughtworks.dsl.macros.Reset.Default.*
   * val buffer = new StringBuffer
   * def recoverFuture = Future {
   *   buffer.append("Oh")
@@ -86,7 +86,7 @@ import scala.language.implicitConversions
   * {{{
   * import scala.concurrent.Future
   * import com.thoughtworks.dsl.keywords.{Get, Return}
-  * import com.thoughtworks.dsl.reset, reset._
+  * import com.thoughtworks.dsl.macros.Reset.Default.*
   * val buffer = new StringBuffer
   * def recoverFuture = Future {
   *   buffer.append("Oh")

keywords-Await/src/test/scala/com/thoughtworks/dsl/keywords/AwaitTest.scala

@@ -1,7 +1,7 @@
 package com.thoughtworks.dsl
 package keywords
 
-import reset.{`*`, reify}
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import Dsl.!!
 import Dsl.Run
 import Dsl.IsKeyword

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

@@ -17,7 +17,7 @@ import scala.collection.mutable.Builder
   *   [[Each]] keywords can be used to calculate cartesian product.
   *
   * {{{
-  *           import com.thoughtworks.dsl.reset, reset._
+  *           import com.thoughtworks.dsl.macros.Reset.Default.*
   *           def cartesianProduct = reset (List(!Each(Array(1, 2, 3)) * !Each(Vector(1, 10, 100, 1000))))
   *           cartesianProduct should be(List(1, 10, 100, 1000, 2, 20, 200, 2000, 3, 30, 300, 3000))
   * }}}

keywords-Each/src/test/scala/com/thoughtworks/dsl/keywords/EachSpec.scala

@@ -2,7 +2,7 @@ package com.thoughtworks.dsl
 package keywords
 
 import com.thoughtworks.dsl.Dsl.!!
-import com.thoughtworks.dsl.reset, reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.should.Matchers
 
@@ -100,9 +100,9 @@ class EachSpec extends AnyFreeSpec with Matchers {
         val seq = 1 to 10
 
         def run(): Seq[Int] = reset {
-          def plus100 = reset apply Seq {
+          def plus100 = reset(Seq {
             !Each(seq) + 100
-          }
+          })
           plus100.length should be(10)
           Seq(!Each(plus100))
         }

keywords-Each/src/test/scala/com/thoughtworks/dsl/keywords/ForEachSpec.scala

@@ -2,7 +2,7 @@ package com.thoughtworks.dsl.keywords
 
 import com.thoughtworks.dsl.Dsl.!!
 import org.scalatest.freespec.AnyFreeSpec
-import com.thoughtworks.dsl.reset, reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import org.scalatest.matchers.should.Matchers
 
 /** @author 杨博 (Yang Bo)
@@ -28,9 +28,9 @@ class ForEachSpec extends AnyFreeSpec with Matchers {
       val seq = 1 to 10
 
       def run(): Unit = reset[Unit] {
-        def plus100 = reset apply Seq(
+        def plus100 = reset(Seq(
           !Each(seq) + 100
-        )
+        ))
         plus100.length should be(10)
         !Each(plus100)
       }

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

@@ -20,7 +20,7 @@ import com.thoughtworks.dsl.Dsl.IsKeyword
   *   and returns the upper-cased last character of the parameter.
   *
   * {{{
-  * import com.thoughtworks.dsl.reset
+  * import com.thoughtworks.dsl.macros.Reset.Default.reset
   * def upperCasedLastCharacter = reset[String => Char] {
   *   val initialValue = !Get[String]
   *   !Put(initialValue.toUpperCase)
@@ -44,7 +44,7 @@ import com.thoughtworks.dsl.Dsl.IsKeyword
   * `Vector[Any]` of string buffers.
   *
   * {{{
-  * import com.thoughtworks.dsl.reset
+  * import com.thoughtworks.dsl.macros.Reset.Default.reset
   * def formatter = reset[Double => Int => Vector[Any] => String] {
   *   !Put(!Get[Vector[Any]] :+ "x=")
   *   !Put(!Get[Vector[Any]] :+ !Get[Double])

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

@@ -1,7 +1,7 @@
 package com.thoughtworks.dsl
 package keywords
 
-import com.thoughtworks.dsl.reset, reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import com.thoughtworks.dsl.Dsl
 import com.thoughtworks.dsl.Dsl.!!
 import com.thoughtworks.dsl.Dsl.IsKeyword
@@ -53,7 +53,7 @@ object Using {
     *           import scala.concurrent.Future
     *           import com.thoughtworks.dsl.keywords.Using.scopeExit
     *           import com.thoughtworks.dsl.keywords.Using.unary_!
-    *           import com.thoughtworks.dsl.reset, reset._
+    *           import com.thoughtworks.dsl.macros.Reset.Default.*
     *           var n = 1
     *           def multiplicationAfterAddition = *[Future] {
     *             !scopeExit { () =>

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

@@ -20,14 +20,14 @@ import scala.language.higherKinds
   *   `Seq[Element]` or `Seq[Element] !! ...`, or it will not compile.
   *
   * {{{
-  *           import com.thoughtworks.dsl.reset, reset._
+  *           import com.thoughtworks.dsl.macros.Reset.Default.*
   *           "def f(): Int = !Yield(1)" shouldNot compile
   * }}}
   *
   * @example
   *   [[Yield]] keywords can be used together with other keywords.
   * {{{
-  *           import com.thoughtworks.dsl.reset, reset._
+  *           import com.thoughtworks.dsl.macros.Reset.Default.*
   *           def gccFlagBuilder(sourceFile: String, includes: String*) = reset[Stream[String]] {
   *             !Yield("gcc")
   *             !Yield("-c")

keywords-Yield/src/test/scala/com/thoughtworks/dsl/keywords/YieldSpec.scala

@@ -1,6 +1,6 @@
 package com.thoughtworks.dsl
 package keywords
-import reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import com.thoughtworks.dsl.Dsl.!!
 import scala.annotation.tailrec
 import scala.collection.{LinearSeq, SeqView}

keywords-Yield/src/test/scala/com/thoughtworks/dsl/keywords/YieldSpec213.scala

@@ -1,6 +1,6 @@
 package com.thoughtworks.dsl.keywords
 
-import com.thoughtworks.dsl.reset, reset._
+import com.thoughtworks.dsl.macros.Reset.Default.*
 import com.thoughtworks.dsl.Dsl.!!
 import org.scalatest.freespec.AnyFreeSpec
 import org.scalatest.matchers.should.Matchers