From 09f15965cf8fb86077e06bcf6c4f34af4ad7b0e7 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 3 Jan 2024 21:23:18 +0000
Subject: Introduce specific subtypes for constructed types

---
 .../org/shedlang/compiler/shid/ShidCodeGenFieldAccessTests.java   | 2 +-
 .../shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java  | 2 +-
 .../compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java   | 4 ++--
 .../org/shedlang/compiler/typechecker/TypeCheckerWhenTests.java   | 8 ++++----
 .../java/org/shedlang/compiler/types/ConstructedTypeTests.java    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/test/java')

diff --git a/src/test/java/org/shedlang/compiler/shid/ShidCodeGenFieldAccessTests.java b/src/test/java/org/shedlang/compiler/shid/ShidCodeGenFieldAccessTests.java
index 7dc159bd..e7560770 100644
--- a/src/test/java/org/shedlang/compiler/shid/ShidCodeGenFieldAccessTests.java
+++ b/src/test/java/org/shedlang/compiler/shid/ShidCodeGenFieldAccessTests.java
@@ -65,7 +65,7 @@ public class ShidCodeGenFieldAccessTests {
             List.of(TypeParam.forStructType(structType, "T")),
             structType
         );
-        var constructedType = Types.constructedType(
+        var constructedType = Types.constructedStructType(
             typeConstructor,
             List.of(Types.STRING)
         );
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
index b94185e2..bf04c4fd 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIsSubTypeTests.java
@@ -180,7 +180,7 @@ public class TypeCheckerIsSubTypeTests {
             List.of(TypeParam.forStructType(variantType1, "T")),
             variantType1
         );
-        var constructedVariantType1 = Types.constructedType(
+        var constructedVariantType1 = Types.constructedStructType(
             variantTypeConstructor1,
             List.of(Types.STRING)
         );
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java
index 33d254cd..a605e029 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerSumTypeDefinitionTests.java
@@ -227,14 +227,14 @@ public class TypeCheckerSumTypeDefinitionTests {
         assertThat(
             sumTypeInfo,
             has("variants", x -> x.variants(), isSequence(
-                equalTo(SumVariant.constructedStruct(Types.constructedType(
+                equalTo(SumVariant.constructedStruct(Types.constructedStructType(
                     variantTypeConstructor1,
                     List.of(TypeParam.forSumType(
                         Types.sum(NAMESPACE_NAME, "ExampleSumType"),
                         "T1"
                     ))
                 ))),
-                equalTo(SumVariant.constructedStruct(Types.constructedType(
+                equalTo(SumVariant.constructedStruct(Types.constructedStructType(
                     variantTypeConstructor2,
                     List.of(TypeParam.forSumType(
                         Types.sum(NAMESPACE_NAME, "ExampleSumType"),
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerWhenTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerWhenTests.java
index 1dc0f545..0db2546f 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerWhenTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerWhenTests.java
@@ -206,7 +206,7 @@ public class TypeCheckerWhenTests {
             List.of(TypeParam.forStructType(VARIANT_TYPE_1, "T")),
             VARIANT_TYPE_1
         );
-        var constructedVariantType1 = Types.constructedType(
+        var constructedVariantType1 = Types.constructedStructType(
             variantTypeConstructor1,
             List.of(Types.STRING)
         );
@@ -269,7 +269,7 @@ public class TypeCheckerWhenTests {
             List.of(TypeParam.forStructType(VARIANT_TYPE_1, "T")),
             VARIANT_TYPE_1
         );
-        var constructedVariantType1 = Types.constructedType(
+        var constructedVariantType1 = Types.constructedStructType(
             variantTypeConstructor1,
             List.of(Types.STRING)
         );
@@ -333,7 +333,7 @@ public class TypeCheckerWhenTests {
             List.of(TypeParam.forStructType(VARIANT_TYPE_1, "T")),
             VARIANT_TYPE_1
         );
-        var constructedVariantType1 = Types.constructedType(
+        var constructedVariantType1 = Types.constructedStructType(
             variantTypeConstructor1,
             List.of(Types.STRING)
         );
@@ -359,7 +359,7 @@ public class TypeCheckerWhenTests {
         );
         var context = TypeCheckerContext.EMPTY
             .addSumTypeInfo(SUM_TYPE, new SumTypeInfo(P.orderedSet(
-                SumVariant.constructedStruct(Types.constructedType(
+                SumVariant.constructedStruct(Types.constructedStructType(
                     variantTypeConstructor1,
                     List.of(TypeParam.forSumType(SUM_TYPE, "T"))
                 )),
diff --git a/src/test/java/org/shedlang/compiler/types/ConstructedTypeTests.java b/src/test/java/org/shedlang/compiler/types/ConstructedTypeTests.java
index 9b875dce..1c3d90db 100644
--- a/src/test/java/org/shedlang/compiler/types/ConstructedTypeTests.java
+++ b/src/test/java/org/shedlang/compiler/types/ConstructedTypeTests.java
@@ -14,7 +14,7 @@ public class ConstructedTypeTests {
             NamespaceName.of("Example", "Project"),
             "Map"
         );
-        var constructedType = new ConstructedType<>(
+        var constructedType = Types.constructedType(
             new TypeConstructor<>(
                 List.of(
                     TypeParam.forStructType(structType, "K"),
-- 
cgit v1.2.3