From cddbde16fa288781732853db226fc02434491aa5 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 3 Jan 2024 21:08:58 +0000
Subject: Rename substitute() to substituteType()

---
 .../java/org/shedlang/compiler/typechecker/TypeChecker.java  |  4 ++--
 .../java/org/shedlang/compiler/typechecker/TypeInfos.java    |  2 +-
 .../java/org/shedlang/compiler/types/TypeSubstitution.java   | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/main/java')

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()
         );
     }
-- 
cgit v1.2.3