proj: move source roots

base/build.gradle.kts

@@ -1,10 +1,13 @@
 // Copyright (c) 2020-2023 Tesla (Yinsen) Zhang.
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
-import org.aya.gradle.*
+import org.aya.gradle.CommonTasks
+import org.aya.gradle.GenerateReflectionConfigTask
+import org.aya.gradle.GenerateVersionTask
+
 CommonTasks.nativeImageConfig(project)
 
 dependencies {
-  api(project(":tools"))
+  api(project(":tools-kala"))
   api(project(":tools-md"))
   api(project(":pretty"))
   api(libs.aya.guest0x0)

tools-kala/build.gradle.kts

@@ -0,0 +1,6 @@
+// Copyright (c) 2020-2023 Tesla (Yinsen) Zhang.
+// Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
+dependencies {
+  api(libs.kala.common)
+  api(project(":tools"))
+}

tools-kala/src/main/java/module-info.java

@@ -0,0 +1,9 @@
+module aya.util.kala {
+  requires transitive aya.util;
+
+  requires static org.jetbrains.annotations;
+  requires transitive kala.collection.primitive;
+
+  exports org.aya.util.tyck.pat;
+  exports org.aya.util.terck;
+}

tools/src/main/java/org/aya/util/terck/CallGraph.java → tools-kala/src/main/java/org/aya/util/terck/CallGraph.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2023 Tesla (Yinsen) Zhang.
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 package org.aya.util.terck;
 

tools/src/main/java/org/aya/util/terck/CallMatrix.java → tools-kala/src/main/java/org/aya/util/terck/CallMatrix.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2023 Tesla (Yinsen) Zhang.
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 package org.aya.util.terck;
 

tools/src/main/java/org/aya/util/terck/Diagonal.java → tools-kala/src/main/java/org/aya/util/terck/Diagonal.java

@@ -1,23 +1,23 @@
-// Copyright (c) 2020-2022 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2023 Tesla (Yinsen) Zhang.
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 package org.aya.util.terck;
 
 import kala.collection.immutable.ImmutableSeq;
+import kala.collection.mutable.MutableList;
+import kala.range.primitive.IntRange;
 import org.aya.pretty.doc.Doc;
 import org.aya.pretty.doc.Docile;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.stream.IntStream;
-
 public record Diagonal<C, T, P>(
   @NotNull CallMatrix<C, T, P> matrix,
   @NotNull ImmutableSeq<Relation> diagonal
 ) implements Docile {
   public static <C, T, P> @NotNull Diagonal<C, T, P> create(@NotNull CallMatrix<C, T, P> matrix) {
     assert matrix.rows() == matrix.cols();
-    var diag = IntStream.range(0, matrix.rows())
-      .mapToObj(i -> matrix.matrix()[i][i])
-      .collect(ImmutableSeq.factory());
+    var diag = IntRange.openClosed(0, matrix.rows())
+      .mapToObjTo(MutableList.create(), i -> matrix.matrix()[i][i])
+      .toImmutableSeq();
     return new Diagonal<>(matrix, diag);
   }
 

tools/src/main/java/org/aya/util/terck/MutableGraph.java → tools-kala/src/main/java/org/aya/util/terck/MutableGraph.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2023 Tesla (Yinsen) Zhang.
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 package org.aya.util.terck;
 

tools-repl/build.gradle.kts

@@ -1,8 +1,7 @@
-// Copyright (c) 2020-2022 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2023 Tesla (Yinsen) Zhang.
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 dependencies {
-  api(project(":pretty"))
-  api(project(":tools"))
+  api(project(":tools-kala"))
   api(libs.jline.reader)
   api(libs.jline.terminal.api)
 }

tools/build.gradle.kts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 dependencies {
   api(libs.annotations)
-  api(libs.kala.common)
+  api(libs.kala.collection)
   api(project(":pretty"))
   implementation(libs.aya.ij.text)
   testImplementation(libs.junit.jupiter)

tools/src/main/java/module-info.java

@@ -9,8 +9,6 @@
   exports org.aya.util.error;
   exports org.aya.util.prettier;
   exports org.aya.util.reporter;
-  exports org.aya.util.terck;
-  exports org.aya.util.tyck.pat;
   exports org.aya.util.tyck;
   exports org.aya.util;
 }