From cddbde16fa288781732853db226fc02434491aa5 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Wed, 3 Jan 2024 21:08:58 +0000 Subject: Rename substitute() to substituteType() --- .../compiler/types/TypeSubstitutionTests.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/test/java') 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)); } -- cgit v1.2.3