test: fix

Author: ice1000

Diff for: base/src/main/java/org/aya/resolve/salt/AyaBinOpSet.java

@@ -5,8 +5,10 @@
 import kala.collection.immutable.ImmutableSeq;
 import org.aya.resolve.context.Context;
 import org.aya.resolve.error.OperatorError;
+import org.aya.syntax.core.def.TyckAnyDef;
 import org.aya.tyck.tycker.Problematic;
 import org.aya.util.binop.BinOpSet;
+import org.aya.util.binop.OpDecl;
 import org.aya.util.error.SourcePos;
 import org.aya.util.reporter.Reporter;
 import org.jetbrains.annotations.NotNull;
@@ -15,6 +17,11 @@ public final class AyaBinOpSet extends BinOpSet implements Problematic {
   public final @NotNull Reporter reporter;
   public AyaBinOpSet(@NotNull Reporter reporter) { this.reporter = reporter; }
   @Override public @NotNull Reporter reporter() { return reporter; }
+  @Override public boolean equals(@NotNull OpDecl lhs, @NotNull OpDecl rhs) {
+    if (lhs instanceof TyckAnyDef<?> wrapper) lhs = wrapper.ref.concrete;
+    if (rhs instanceof TyckAnyDef<?> wrapper) rhs = wrapper.ref.concrete;
+    return lhs == rhs;
+  }
   @Override protected void reportSelfBind(@NotNull SourcePos sourcePos) {
     fail(new OperatorError.SelfBind(sourcePos));
     throw new Context.ResolvingInterruptedException();

Diff for: base/src/main/java/org/aya/resolve/salt/ExprBinParser.java

@@ -33,29 +33,27 @@ public ExprBinParser(@NotNull ResolveInfo resolveInfo, @NotNull SeqView<Expr.@No
     new WithPos<>(SourcePos.NONE, new Expr.Error(Doc.english("fakeApp escaped from BinOpParser")))
   );
 
-  @Override protected @NotNull Expr.NamedArg appOp() {
-    return OP_APP;
-  }
+  @Override protected @NotNull Expr.NamedArg appOp() { return OP_APP; }
 
   @Override protected @NotNull BinOpParser<AyaBinOpSet, WithPos<Expr>, Expr.NamedArg>
   replicate(@NotNull SeqView<Expr.@NotNull NamedArg> seq) {
     return new ExprBinParser(resolveInfo, seq);
   }
 
   @Override protected void reportAmbiguousPred(String op1, String op2, SourcePos pos) {
-    opSet.reporter.report(new OperatorError.Precedence(op1, op2, pos));
+    opSet.fail(new OperatorError.Precedence(op1, op2, pos));
   }
 
   @Override protected @NotNull WithPos<Expr> createErrorExpr(@NotNull SourcePos sourcePos) {
     return new WithPos<>(sourcePos, new Expr.Error(Doc.english("an application")));
   }
 
   @Override protected void reportFixityError(Assoc top, Assoc current, String topOp, String currentOp, SourcePos pos) {
-    opSet.reporter.report(new OperatorError.Fixity(currentOp, current, topOp, top, pos));
+    opSet.fail(new OperatorError.Fixity(currentOp, current, topOp, top, pos));
   }
 
   @Override protected void reportMissingOperand(String op, SourcePos pos) {
-    opSet.reporter.report(new OperatorError.MissingOperand(pos, op));
+    opSet.fail(new OperatorError.MissingOperand(pos, op));
   }
 
   @Override protected @Nullable OpDecl underlyingOpDecl(@NotNull Expr.NamedArg elem) {

Diff for: cli-impl/src/main/java/org/aya/cli/interactive/ReplCompiler.java

@@ -6,6 +6,9 @@
 import kala.control.Either;
 import kala.function.CheckedFunction;
 import kala.value.MutableValue;
+import org.aya.cli.library.LibraryCompiler;
+import org.aya.cli.library.incremental.CompilerAdvisor;
+import org.aya.cli.library.json.LibraryConfigData;
 import org.aya.cli.library.source.LibraryOwner;
 import org.aya.cli.single.CompilerFlags;
 import org.aya.cli.single.SingleAyaFile;
@@ -100,15 +103,14 @@ public void loadToContext(@NotNull Path file) throws IOException {
 
   private void loadLibrary(@NotNull Path libraryRoot) throws IOException {
     var flags = new CompilerFlags(CompilerFlags.Message.EMOJI, false, true, null, modulePaths.view(), null);
-    throw new UnsupportedOperationException("TODO");
-    // try {
-    //   var compiler = LibraryCompiler.newCompiler(primFactory, reporter, flags, CompilerAdvisor.onDisk(), libraryRoot);
-    //   compiler.start();
-    //   var owner = compiler.libraryOwner();
-    //   importModule(owner);
-    // } catch (LibraryConfigData.BadConfig bad) {
-    //   reporter.reportString("Cannot load malformed library: " + bad.getMessage(), Problem.Severity.ERROR);
-    // }
+    try {
+      var compiler = LibraryCompiler.newCompiler(primFactory, reporter, flags, CompilerAdvisor.onDisk(), libraryRoot);
+      compiler.start();
+      var owner = compiler.libraryOwner();
+      importModule(owner);
+    } catch (LibraryConfigData.BadConfig bad) {
+      reporter.reportString("Cannot load malformed library: " + bad.getMessage(), Problem.Severity.ERROR);
+    }
   }
 
   private void importModule(@NotNull LibraryOwner owner) {
@@ -119,7 +121,7 @@ private void importModule(@NotNull LibraryOwner owner) {
     owner.libraryDeps().forEach(this::importModule);
   }
 
-  /** @see org.aya.cli.single.SingleFileCompiler#compile(Path, Function, CompilerFlags, ModuleCallback) */
+  /** @see org.aya.cli.single.SingleFileCompiler#compile(Path, ModuleCallback) */
   private void loadFile(@NotNull Path file) {
     compileToContext(parser -> Either.left(fileManager.createAyaFile(locator, file).parseMe(parser)), NormalizeMode.HEAD);
   }

Diff for: tools-kala/src/main/java/org/aya/util/binop/BinOpSet.java

@@ -39,6 +39,8 @@ public Assoc assocOf(@Nullable OpDecl opDecl) {
     return ensureHasElem(opDecl).assoc;
   }
 
+  public abstract boolean equals(@NotNull OpDecl lhs, @NotNull OpDecl rhs);
+
   public final boolean isOperand(@Nullable OpDecl opDecl) {
     return opDecl == null || opDecl.opInfo() == null;
   }
@@ -48,7 +50,7 @@ public BinOP ensureHasElem(@NotNull OpDecl opDecl) {
   }
 
   public BinOP ensureHasElem(@NotNull OpDecl opDecl, @NotNull SourcePos sourcePos) {
-    var elem = ops.find(e -> e.op == opDecl);
+    var elem = ops.find(e -> equals(e.op, opDecl));
     if (elem.isDefined()) return elem.get();
     var newElem = BinOP.from(sourcePos, opDecl);
     ops.add(newElem);