free: fix TODOs

Author: ice1000

jit-compiler/src/main/java/org/aya/compiler/free/FreeExprBuilder.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2024 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2025 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.compiler.free;
 
@@ -38,7 +38,6 @@ public interface FreeExprBuilder {
     return mkNew(conRef, args);
   }
 
-  // TODO: inline this
   default @NotNull FreeJavaExpr refVar(@NotNull LocalVariable name) {
     return name.ref();
   }

jit-compiler/src/main/java/org/aya/compiler/free/FreeJavaResolver.java

@@ -1,10 +1,10 @@
-// Copyright (c) 2020-2024 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2025 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.compiler.free;
 
 import kala.collection.immutable.ImmutableSeq;
-import org.aya.compiler.free.data.MethodRef;
 import org.aya.compiler.free.data.FieldRef;
+import org.aya.compiler.free.data.MethodRef;
 import org.aya.util.error.Panic;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,10 +34,7 @@ public final class FreeJavaResolver {
     return new FieldRef(owner, returnType, name);
   }
 
-  public static @NotNull FieldRef resolve(
-    @NotNull Class<?> owner,
-    @NotNull String name
-  ) {
+  public static @NotNull FieldRef resolve(@NotNull Class<?> owner, @NotNull String name) {
     try {
       var field = owner.getField(name);
       return resolve(FreeUtil.fromClass(owner), name, FreeUtil.fromClass(field.getType()));

jit-compiler/src/main/java/org/aya/compiler/free/morphism/free/FreeCodeBuilderImpl.java

@@ -149,8 +149,7 @@ public void switchCase(
     stmts.append(new FreeStmt.Switch(assertFreeVariable(elim), cases, branchBodies, defaultBody));
   }
 
-  @Override
-  public void returnWith(@NotNull FreeJavaExpr expr) {
+  @Override public void returnWith(@NotNull FreeJavaExpr expr) {
     stmts.append(new FreeStmt.Return(assertFreeExpr(expr)));
   }
 
@@ -159,8 +158,7 @@ public void returnWith(@NotNull FreeJavaExpr expr) {
     return FreeExprBuilderImpl.INSTANCE.mkNew(conRef, args);
   }
 
-  @Override
-  public @NotNull FreeJavaExpr refVar(@NotNull LocalVariable name) {
+  @Override public @NotNull FreeJavaExpr refVar(@NotNull LocalVariable name) {
     return FreeExprBuilderImpl.INSTANCE.refVar(name);
   }
 

jit-compiler/src/main/java/org/aya/compiler/free/morphism/source/SourceCodeBuilder.java

@@ -1,11 +1,14 @@
-// Copyright (c) 2020-2024 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2025 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.compiler.free.morphism.source;
 
 import kala.collection.immutable.ImmutableSeq;
 import kala.collection.immutable.primitive.ImmutableIntSeq;
 import org.aya.compiler.SourceBuilder;
-import org.aya.compiler.free.*;
+import org.aya.compiler.free.ArgumentProvider;
+import org.aya.compiler.free.FreeCodeBuilder;
+import org.aya.compiler.free.FreeJavaExpr;
+import org.aya.compiler.free.FreeUtil;
 import org.aya.compiler.free.data.FieldRef;
 import org.aya.compiler.free.data.LocalVariable;
 import org.aya.compiler.free.data.MethodRef;
@@ -234,10 +237,6 @@ private void buildIf(
     return mkNew(FreeUtil.fromClass(className), args);
   }
 
-  @Override public @NotNull FreeJavaExpr refVar(@NotNull LocalVariable name) {
-    return name.ref();
-  }
-
   @Override
   public @NotNull SourceFreeJavaExpr.Cont invoke(@NotNull MethodRef method, @NotNull FreeJavaExpr owner, @NotNull ImmutableSeq<FreeJavaExpr> args) {
     return () -> {

jit-compiler/src/main/java/org/aya/compiler/serializers/PatternSerializer.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2024 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2025 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.compiler.serializers;
 
@@ -96,7 +96,6 @@ private void doSerialize(
         onMatchSucc.accept(builder);
       }
 
-      // TODO: match IntegerTerm / ListTerm first
       case Pat.Con con -> builder.ifInstanceOf(term, FreeUtil.fromClass(ConCallLike.class),
         (builder1, conTerm) -> builder1.ifRefEqual(
           AbstractExprializer.getRef(builder1, CallKind.Con, conTerm.ref()),

jit-compiler/src/main/java/org/aya/compiler/serializers/TermExprializer.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2024 Tesla (Yinsen) Zhang.
+// Copyright (c) 2020-2025 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.compiler.serializers;
 
@@ -7,6 +7,7 @@
 import kala.tuple.Tuple;
 import kala.tuple.Tuple2;
 import org.aya.compiler.free.*;
+import org.aya.compiler.free.data.FieldRef;
 import org.aya.compiler.free.data.MethodRef;
 import org.aya.compiler.serializers.ModuleSerializer.MatchyRecorder;
 import org.aya.generic.stmt.Shaped;
@@ -25,22 +26,19 @@
 
 import java.lang.constant.ClassDesc;
 import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
  * Build the "constructor form" of {@link Term}, but in Java.
  */
 public final class TermExprializer extends AbstractExprializer<Term> {
-  /**
-   * Terms that should be instantiated
-   */
+  public static final @NotNull FieldRef TYPE0_FIELD = FreeJavaResolver.resolve(SortTerm.class, "Type0");
+  public static final @NotNull FieldRef ISET_FIELD = FreeJavaResolver.resolve(SortTerm.class, "ISet");
+  /// Terms that should be instantiated
   private final @NotNull ImmutableSeq<FreeJavaExpr> instantiates;
   private final @NotNull MutableLinkedHashMap<LocalVar, FreeJavaExpr> binds;
 
-  /**
-   * Whether allow LocalTerm, false in default (in order to report unexpected LocalTerm)
-   */
+  /// Whether allow {@link LocalTerm}, false in default (in order to report unexpected LocalTerm)
   private final boolean allowLocalTerm;
   private final @NotNull MatchyRecorder recorder;
 
@@ -188,11 +186,8 @@ case FnCall(var ref, var ulift, var args) -> buildFnInvoke(
         ));
         yield builder.invoke(Constants.RULEREDUCER_MAKE, onStuck, ImmutableSeq.empty());
       }
-      // TODO: make the resolving const
-      case SortTerm sort when sort.equals(SortTerm.Type0) ->
-        builder.refField(FreeJavaResolver.resolve(SortTerm.class, "Type0"));
-      case SortTerm sort when sort.equals(SortTerm.ISet) ->
-        builder.refField(FreeJavaResolver.resolve(SortTerm.class, "ISet"));
+      case SortTerm sort when sort.equals(SortTerm.Type0) -> builder.refField(TYPE0_FIELD);
+      case SortTerm sort when sort.equals(SortTerm.ISet) -> builder.refField(ISET_FIELD);
       case SortTerm(var kind, var ulift) ->
         builder.mkNew(SortTerm.class, ImmutableSeq.of(builder.refEnum(kind), builder.iconst(ulift)));
       case DepTypeTerm(var kind, var param, var body) -> builder.mkNew(DepTypeTerm.class, ImmutableSeq.of(
@@ -271,11 +266,6 @@ yield buildMatchyInvoke(NameSerializer.getClassDesc(ref),
     });
   }
 
-  // TODO: unify with makeClosure
-  private @NotNull FreeJavaExpr makeThunk(@NotNull Function<TermExprializer, FreeJavaExpr> cont) {
-    return makeLambda(Constants.THUNK, (_, te) -> cont.apply(te));
-  }
-
   private @NotNull FreeJavaExpr makeClosure(@NotNull BiFunction<TermExprializer, FreeJavaExpr, FreeJavaExpr> cont) {
     return makeLambda(Constants.CLOSURE, (ap, te) -> cont.apply(te, ap.arg(0).ref()));
   }