aboutsummaryrefslogtreecommitdiff
path: root/src/test/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-09-30 17:54:10 +0100
committerMichael Williamson <mike@zwobble.org>2023-09-30 17:54:10 +0100
commit0b88941c9627213f2708abd509d959e6ddc04bec (patch)
tree08f142ef30b2d6002f0bdb699f6aea6680b6600e /src/test/java
parenta1806b32dc21709d81e2378923910b100145cf90 (diff)
Use TypeInfos as builder in TypeCheckerContext
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java5
-rw-r--r--src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
index 34179cb2..508bf6cd 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerNamespaceTests.java
@@ -486,8 +486,11 @@ public class TypeCheckerNamespaceTests {
var result = TypeChecker.typeCheckNamespace(untyped, context);
+ var namespaceTypeInfo = result.context().toTypeInfos()
+ .namespaceTypeInfo(namespaceName)
+ .orElseThrow();
assertThat(
- result.context().namespaceTypeInfo().get(namespaceName),
+ namespaceTypeInfo,
equalTo(NamespaceTypeInfo.fromFields(P.orderedMap(
Map.entry("f", new FunctionType(List.of(), List.of(), Effects.NONE, Types.UNIT))
)))
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java
index 5d53301d..53c5d5e8 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java
@@ -114,8 +114,11 @@ public class TypeCheckerStructDefinitionTests {
var typed = typeCheckNamespaceStatement(untyped, context);
+ var structTypeInfo = typed.context().toTypeInfos()
+ .structTypeInfo(Types.struct(NAMESPACE_NAME, "ExampleStruct"))
+ .orElseThrow();
assertThat(
- typed.context().structTypeInfos().get(Types.struct(NAMESPACE_NAME, "ExampleStruct")),
+ structTypeInfo,
// TODO: builder for OrderedPMap
has("fields", x -> x.fields().stream().toList(), isSequence(
equalTo(Map.entry("b", Types.BOOL)),