Rename substitute() to substituteType()

4 files changed, 24 insertions, 24 deletions

diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index 8d8111fb..854fdbfe 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -397,7 +397,7 @@ public class TypeChecker {
             typedReceiver,
             typedArgs,
             untyped.hasEffects(),
-            TypeSubstitution.substitute(receiverType.returnType(), typeSubstitutionMap),
+            TypeSubstitution.substituteType(receiverType.returnType(), typeSubstitutionMap),
             untyped.source()
         ));
     }
@@ -688,7 +688,7 @@ public class TypeChecker {
                     fieldName,
                     source,
                     context
-                ).map(genericFieldType -> TypeSubstitution.substitute(
+                ).map(genericFieldType -> TypeSubstitution.substituteType(
                     genericFieldType,
                     receiverTypeConstructed.typeSubstitutionMap()
                 ));
diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeInfos.java b/src/main/java/org/shedlang/compiler/typechecker/TypeInfos.java
index 075daf51..99947094 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeInfos.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeInfos.java
@@ -71,7 +71,7 @@ public class TypeInfos {
             for (var field : typeInfo.fields()) {
                 fieldsInfoBuilder = fieldsInfoBuilder.addField(
                     field.name(),
-                    TypeSubstitution.substitute(field.type(), typeSubstitutionMap)
+                    TypeSubstitution.substituteType(field.type(), typeSubstitutionMap)
                 );
             }
 
diff --git a/src/main/java/org/shedlang/compiler/types/TypeSubstitution.java b/src/main/java/org/shedlang/compiler/types/TypeSubstitution.java
index e8511065..60edfdfb 100644
--- a/src/main/java/org/shedlang/compiler/types/TypeSubstitution.java
+++ b/src/main/java/org/shedlang/compiler/types/TypeSubstitution.java
@@ -5,7 +5,7 @@ import java.util.Optional;
 public class TypeSubstitution {
     private TypeSubstitution() {}
 
-    public static Type substitute(Type type, TypeSubstitutionMap map) {
+    public static Type substituteType(Type type, TypeSubstitutionMap map) {
         return switch (type) {
             case BoolType boolType ->
                 type;
@@ -19,13 +19,13 @@ public class TypeSubstitution {
             case FunctionType functionType -> new FunctionType(
                 Optional.empty(),
                 functionType.positionalParams().stream()
-                    .map(param -> substitute(param, map))
+                    .map(param -> substituteType(param, map))
                     .toList(),
                 functionType.namedParams().stream()
-                    .map(param -> new NamedParam(param.name(), substitute(param.type(), map)))
+                    .map(param -> new NamedParam(param.name(), substituteType(param.type(), map)))
                     .toList(),
                 functionType.effect(),
-                substitute(functionType.returnType(), map)
+                substituteType(functionType.returnType(), map)
             );
 
             case IntType intType ->
@@ -50,7 +50,7 @@ public class TypeSubstitution {
             case TupleType tupleType ->
                 new TupleType(
                     tupleType.elements().stream()
-                        .map(element -> substitute(element, map))
+                        .map(element -> substituteType(element, map))
                         .toList()
                 );
 
@@ -73,7 +73,7 @@ public class TypeSubstitution {
         return new ConstructedType<>(
             constructedType.constructor(),
             constructedType.args().stream()
-                .map(arg -> substitute(arg, map))
+                .map(arg -> substituteType(arg, map))
                 .toList()
         );
     }
diff --git a/src/test/java/org/shedlang/compiler/types/TypeSubstitutionTests.java b/src/test/java/org/shedlang/compiler/types/TypeSubstitutionTests.java
index d6713ee0..dd115564 100644
--- a/src/test/java/org/shedlang/compiler/types/TypeSubstitutionTests.java
+++ b/src/test/java/org/shedlang/compiler/types/TypeSubstitutionTests.java
@@ -19,7 +19,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(Types.BOOL, typeSubstitutionMap);
+        var result = TypeSubstitution.substituteType(Types.BOOL, typeSubstitutionMap);
 
         assertThat(result, equalTo(Types.BOOL));
     }
@@ -30,7 +30,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(Types.BOTTOM, typeSubstitutionMap);
+        var result = TypeSubstitution.substituteType(Types.BOTTOM, typeSubstitutionMap);
 
         assertThat(result, equalTo(Types.BOTTOM));
     }
@@ -41,7 +41,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             Types.constructedType(
                 Types.typeConstructor(
                     List.of(TypeParam.forStructType(STRUCT_TYPE_2, "T")),
@@ -69,7 +69,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             FunctionType.builder()
                 .addPositionalParam(TypeParam.forStructType(STRUCT_TYPE, "T"))
                 .build(),
@@ -87,7 +87,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             FunctionType.builder()
                 .addNamedParam("x", TypeParam.forStructType(STRUCT_TYPE, "T"))
                 .build(),
@@ -105,7 +105,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             FunctionType.builder()
                 .withReturnType(TypeParam.forStructType(STRUCT_TYPE, "T"))
                 .build(),
@@ -123,7 +123,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.BOOL)
         );
 
-        var result = TypeSubstitution.substitute(Types.INT, typeSubstitutionMap);
+        var result = TypeSubstitution.substituteType(Types.INT, typeSubstitutionMap);
 
         assertThat(result, equalTo(Types.INT));
     }
@@ -134,7 +134,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             Types.namespace(NamespaceName.of("A")),
             typeSubstitutionMap
         );
@@ -148,7 +148,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(Types.STRING, typeSubstitutionMap);
+        var result = TypeSubstitution.substituteType(Types.STRING, typeSubstitutionMap);
 
         assertThat(result, equalTo(Types.STRING));
     }
@@ -159,7 +159,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             Types.struct(NamespaceName.of("A"), "B"),
             typeSubstitutionMap
         );
@@ -173,7 +173,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(Types.TOP, typeSubstitutionMap);
+        var result = TypeSubstitution.substituteType(Types.TOP, typeSubstitutionMap);
 
         assertThat(result, equalTo(Types.TOP));
     }
@@ -184,7 +184,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             Types.tuple(List.of(TypeParam.forStructType(STRUCT_TYPE, "T"))),
             typeSubstitutionMap
         );
@@ -198,7 +198,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             TypeParam.forStructType(STRUCT_TYPE_2, "T"),
             typeSubstitutionMap
         );
@@ -212,7 +212,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(
+        var result = TypeSubstitution.substituteType(
             TypeParam.forStructType(STRUCT_TYPE, "T"),
             typeSubstitutionMap
         );
@@ -226,7 +226,7 @@ public class TypeSubstitutionTests {
             Map.entry(TypeParam.forStructType(STRUCT_TYPE, "T"), Types.INT)
         );
 
-        var result = TypeSubstitution.substitute(Types.UNIT, typeSubstitutionMap);
+        var result = TypeSubstitution.substituteType(Types.UNIT, typeSubstitutionMap);
 
         assertThat(result, equalTo(Types.UNIT));
     }