Fix Then0 cases

ExoQuery · Dec 26, 2023 · f1c2d61 · f1c2d61
1 parent e87cd3d
commit f1c2d61
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,7 +21,7 @@ apply(plugin = "io.github.gradle-nexus.publish-plugin")
 allprojects {
 
   group = "io.exoquery"
-  version = "0.0.2"
+  version = "0.0.3"
 
   apply(plugin = "kotlin")
   apply(plugin = "maven-publish")

diff --git a/decomat-core/build.gradle.kts b/decomat-core/build.gradle.kts
@@ -36,6 +36,12 @@ tasks.register<TemplateTask>("template_base", TemplateTask::class) {
     into("build/templates/io/decomat")
 }
 
+//tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+//    kotlinOptions{
+//        freeCompilerArgs = listOf("-Xno-optimize")
+//    }
+//}
+
 //tasks.register("template", Sync::class) {
 //    dependsOn("template_base")
 //    from("build/templates/io/decomat")

diff --git a/decomat-core/src/main/kotlin/io/decomat/ThenPattern1.kt b/decomat-core/src/main/kotlin/io/decomat/ThenPattern1.kt
@@ -1,5 +1,23 @@
 package io.decomat
 
+fun <R> case(pat: Pattern0<R>) = ThenIs(pat, {true})
+
+class ThenIs<R>(
+  override val pat: Pattern0<R>,
+  override val check: (R) -> Boolean
+): Stage<Pattern0<R>, R> {
+  inline fun <O> useComponents(r: R, f: (R) -> O): O {
+    return f(r)
+  }
+
+  inline fun thenIf(crossinline f: (R) -> Boolean) = ThenIs(pat) { r: R -> useComponents(r, f) }
+  inline fun thenIfThis(crossinline f: R.() -> (R) -> Boolean) = ThenIs(pat) { r: R -> useComponents(r, f(r)) }
+  inline fun <O> then(crossinline f: (R) -> O): Case<O, R> = StageCase(pat, check) { r: R -> useComponents(r, f) }
+  inline fun <O> thenThis(crossinline f: R.() -> (R) -> O): Case<O, R> = StageCase(pat, check) { r: R -> useComponents(r, f(r)) }
+}
+
+
+
 fun <P1: Pattern0<R1>, R1, R> case(pat: Pattern1<P1, R1, R>) = Then0(pat, {true})
 
 class Then0<P1: Pattern0<R1>, R1, R>(

diff --git a/decomat-core/src/templates/Pattern3.ftl b/decomat-core/src/templates/Pattern3.ftl
@@ -99,8 +99,8 @@
 [@output file="decomat-core/build/templates/io/decomat/Then2.kt"]
 package io.decomat
 
-[#list 0..3 as i1]
-  [#list 0..3 as i2]
+[#list 0..2 as i1]
+  [#list 0..2 as i2]
 [#-- fun <P1: Pattern1<P11, R11, R1>, P2: Pattern0<R2>, P11: Pattern<R11>, R11, R1, R2, R> case(pat: Pattern2<P1, P2, R1, R2, R>) = Then10(pat, {true}) --]
 
 fun <P1: [@PatternVars 1 i1 /], P2: [@PatternVars 2 i2 /], R> case(pat: [@Pattern 2 /]) = Then${i1}${i2}(pat, {true})

diff --git a/decomat-core/src/test/kotlin/io/decomat/ThenTest.kt b/decomat-core/src/test/kotlin/io/decomat/ThenTest.kt
@@ -4,11 +4,41 @@ import kotlin.test.Test
 
 public class ThenTest: DecomatTest {
   // Just check that the types don't fail
+  @Test
+  fun `ThenIs - Is`() =
+    assert(
+      case(Is<Entity>()).then { a -> Res1(a) }.eval(foo) == Res1(foo)
+    )
+
   @Test
   fun typesTest() {
     case(FlatMap_M(Is(), Is())).then { a: Query, b: Query -> Res2(a, b) }
   }
 
+  @Test
+  fun `Then0 - distinct(Is) - Filter`() =
+    assert(
+      case(Distinct_M(Is<Entity>())).then { (a) -> Res1(a) }.eval(Distinct(foo)) == Res1(foo)
+    )
+
+  @Test
+  fun `Then0 - distinct(Is)`() =
+    assert(
+      case(Distinct_M(Is<Entity>())).then { (a) -> Res1(a) }.eval(Distinct(foo)) == Res1(foo)
+    )
+
+  @Test
+  fun `Then1 - distinct(distinct(Is))`() =
+    assert(
+      case(Distinct_M(Distinct_M(Is<Entity>()))).then { (a) -> Res1(a) }.eval(Distinct(Distinct(foo))) == Res1(foo)
+    )
+
+  @Test
+  fun `Then2 - distinct(flatMap(Is, Is))`() =
+    assert(
+      case(Distinct_M(FlatMap_M(Is(), Is()))).then { (a, b) -> Res2(a, b) }.eval(Distinct(FlatMap(foo, bar))) == Res2(foo, bar)
+    )
+
   @Test
   fun `Then00 - flatMap(Is, Is) - Filter`() =
     assert(