proj: move more to fix compile

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

@@ -2,6 +2,7 @@
   requires transitive aya.md;
   requires transitive aya.pretty;
   requires transitive aya.util;
+  requires transitive aya.util.kala;
   requires transitive aya.guest.cubical;
   requires transitive kala.base;
   requires transitive kala.collection;
@@ -15,6 +16,7 @@
   exports org.aya.concrete.error;
   exports org.aya.concrete.remark;
   exports org.aya.concrete.stmt.decl;
+
   exports org.aya.concrete.stmt;
   exports org.aya.concrete.visitor;
   exports org.aya.concrete;

base/src/main/java/org/aya/concrete/Expr.java

@@ -28,8 +28,8 @@
 import org.aya.resolve.visitor.ExprResolver;
 import org.aya.resolve.visitor.StmtShallowResolver;
 import org.aya.tyck.Result;
+import org.aya.util.BinOpElem;
 import org.aya.util.ForLSP;
-import org.aya.util.binop.BinOpParser;
 import org.aya.util.error.SourceNode;
 import org.aya.util.error.SourcePos;
 import org.aya.util.error.WithPos;
@@ -158,7 +158,7 @@ record App(
    * @author AustinZhu
    */
   record NamedArg(@Override boolean explicit, @Nullable String name, @Override @NotNull Expr term)
-    implements AyaDocile, SourceNode, BinOpParser.Elem<Expr> {
+    implements AyaDocile, SourceNode, BinOpElem<Expr> {
 
     public NamedArg(boolean explicit, @NotNull Expr expr) {
       this(explicit, null, expr);

base/src/main/java/org/aya/prettier/BasePrettier.java

@@ -23,8 +23,8 @@
 import org.aya.ref.DefVar;
 import org.aya.ref.LocalVar;
 import org.aya.util.Arg;
+import org.aya.util.BinOpElem;
 import org.aya.util.binop.Assoc;
-import org.aya.util.binop.BinOpParser;
 import org.aya.util.prettier.PrettierOptions;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -76,7 +76,7 @@ protected BasePrettier(@NotNull PrettierOptions options) {
 
   public @NotNull Doc visitCalls(
     @Nullable Assoc assoc, @NotNull Doc fn,
-    @NotNull SeqView<? extends BinOpParser.@NotNull Elem<Term>> args,
+    @NotNull SeqView<? extends @NotNull BinOpElem<Term>> args,
     @NotNull Outer outer, boolean showImplicits
   ) {
     return visitCalls(assoc, fn, this::term, outer, args, showImplicits);
@@ -109,9 +109,9 @@ protected BasePrettier(@NotNull PrettierOptions options) {
    */
   <T extends AyaDocile> @NotNull Doc visitCalls(
     @Nullable Assoc assoc, @NotNull Doc fn, @NotNull Fmt<T> fmt, Outer outer,
-    @NotNull SeqView<? extends BinOpParser.@NotNull Elem<@NotNull T>> args, boolean showImplicits
+    @NotNull SeqView<? extends @NotNull BinOpElem<@NotNull T>> args, boolean showImplicits
   ) {
-    var visibleArgs = (showImplicits ? args : args.filter(BinOpParser.Elem::explicit)).toImmutableSeq();
+    var visibleArgs = (showImplicits ? args : args.filter(BinOpElem::explicit)).toImmutableSeq();
     if (visibleArgs.isEmpty()) return assoc != null ? Doc.parened(fn) : fn;
     if (assoc != null) {
       var firstArg = visibleArgs.getFirst();
@@ -137,14 +137,14 @@ protected BasePrettier(@NotNull PrettierOptions options) {
    * @see #visitCalls(Assoc, Doc, Fmt, Outer, SeqView, boolean)
    */
   private <T extends AyaDocile> @NotNull Doc
-  prefix(@NotNull Doc fn, @NotNull Fmt<T> fmt, Outer outer, SeqView<? extends BinOpParser.@NotNull Elem<T>> args) {
+  prefix(@NotNull Doc fn, @NotNull Fmt<T> fmt, Outer outer, SeqView<? extends @NotNull BinOpElem<T>> args) {
     var call = Doc.sep(fn, Doc.sep(args.map(arg ->
       arg(fmt, arg, Outer.AppSpine))));
     // If we're in a spine, add parentheses
     return checkParen(outer, call, Outer.AppSpine);
   }
 
-  public static <T extends AyaDocile> Doc arg(@NotNull Fmt<T> fmt, @NotNull BinOpParser.Elem<T> arg, @NotNull Outer outer) {
+  public static <T extends AyaDocile> Doc arg(@NotNull Fmt<T> fmt, @NotNull BinOpElem<T> arg, @NotNull Outer outer) {
     if (arg.explicit()) return fmt.apply(outer, arg.term());
     return Doc.braced(fmt.apply(Outer.Free, arg.term()));
   }

pretty/build.gradle.kts

@@ -1,8 +1,8 @@
-// Copyright (c) 2020-2021 Yinsen (Tesla) Zhang.
-// Use of this source code is governed by the MIT license that can be found in the LICENSE file.
+// 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.annotations)
-  api(libs.kala.common)
+  api(libs.kala.collection)
   testImplementation(libs.junit.jupiter)
   testImplementation(libs.hamcrest)
 }

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

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

tools/src/main/java/org/aya/util/binop/Assoc.java → tools-kala/src/main/java/org/aya/util/binop/Assoc.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.binop;
 

tools/src/main/java/org/aya/util/binop/BinOpParser.java → tools-kala/src/main/java/org/aya/util/binop/BinOpParser.java

@@ -8,6 +8,7 @@
 import kala.collection.mutable.*;
 import kala.tuple.Tuple;
 import kala.tuple.Tuple2;
+import org.aya.util.BinOpElem;
 import org.aya.util.error.SourceNode;
 import org.aya.util.error.SourcePos;
 import org.jetbrains.annotations.NotNull;
@@ -18,7 +19,7 @@
 public abstract class BinOpParser<
   OpSet extends BinOpSet,
   Expr extends SourceNode,
-  Elm extends BinOpParser.Elem<Expr>> {
+  Elm extends BinOpElem<Expr>> {
   protected final @NotNull OpSet opSet;
   private final @NotNull SeqView<@NotNull Elm> seq;
 
@@ -214,8 +215,4 @@ enum AppliedSide {
     return a.term().sourcePos();
   }
 
-  public interface Elem<Expr> {
-    @NotNull Expr term();
-    boolean explicit();
-  }
 }

tools/src/main/java/org/aya/util/binop/BinOpSet.java → tools-kala/src/main/java/org/aya/util/binop/BinOpSet.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.binop;
 

tools/src/main/java/org/aya/util/binop/OpDecl.java → tools-kala/src/main/java/org/aya/util/binop/OpDecl.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.binop;
 

tools-md/build.gradle.kts

@@ -1,7 +1,7 @@
 // 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(":tools"))
+  api(project(":tools-kala"))
   api(libs.annotations)
   implementation(libs.aya.commonmark)
   testImplementation(libs.junit.jupiter)

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

@@ -1,9 +1,11 @@
 module aya.md {
   requires aya.util;
+  requires aya.util.kala;
   requires transitive aya.pretty;
 
   requires org.commonmark;
   requires static org.jetbrains.annotations;
+  requires kala.collection.primitive;
 
   exports org.aya.literate;
   exports org.aya.literate.parser;

tools-md/src/main/java/org/aya/literate/parser/BaseMdParser.java

@@ -17,10 +17,10 @@
 import org.aya.pretty.backend.md.MdStyle;
 import org.aya.pretty.doc.Doc;
 import org.aya.pretty.doc.Style;
-import org.aya.util.StringUtil;
 import org.aya.util.error.InternalException;
 import org.aya.util.error.SourceFile;
 import org.aya.util.error.SourcePos;
+import org.aya.util.more.StringUtil;
 import org.aya.util.reporter.Reporter;
 import org.commonmark.node.*;
 import org.commonmark.parser.IncludeSourceSpans;

tools-repl/build.gradle.kts

@@ -1,7 +1,7 @@
 // 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(":tools-kala"))
+  api(project(":tools"))
   api(libs.jline.reader)
   api(libs.jline.terminal.api)
 }

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

@@ -3,9 +3,8 @@
   requires aya.pretty;
 
   requires static org.jetbrains.annotations;
-  requires transitive kala.collection.primitive;
+  requires transitive kala.collection;
 
-  exports org.aya.util.binop;
   exports org.aya.util.error;
   exports org.aya.util.prettier;
   exports org.aya.util.reporter;

tools/src/main/java/org/aya/util/Arg.java

@@ -4,7 +4,6 @@
 
 import kala.collection.SeqView;
 import kala.collection.immutable.ImmutableSeq;
-import org.aya.util.binop.BinOpParser;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;
@@ -16,7 +15,7 @@
  *            In Aya, it is either core term, core pattern, concrete term, or concrete pattern.
  * @author ice1000
  */
-public record Arg<T>(@Override @NotNull T term, @Override boolean explicit) implements BinOpParser.Elem<T> {
+public record Arg<T>(@Override @NotNull T term, @Override boolean explicit) implements BinOpElem<T> {
   public static <T> @NotNull Arg<T> ofExplicitly(@NotNull T term) {
     return new Arg<>(term, true);
   }

tools/src/main/java/org/aya/util/BinOpElem.java

@@ -0,0 +1,10 @@
+// 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;
+
+import org.jetbrains.annotations.NotNull;
+
+public interface BinOpElem<Expr> {
+  @NotNull Expr term();
+  boolean explicit();
+}