From 1ce720a70e964dd002800f4bc96c631229e0fa24 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 28 Sep 2023 13:48:33 +0100 Subject: Pluralise type info collection --- .../java/org/shedlang/compiler/patio/PatioCodeGenFieldLoadTests.java | 4 ++-- .../shedlang/compiler/patio/PatioCodeGenNamespaceFieldStoreTests.java | 4 ++-- .../java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java | 4 ++-- .../compiler/typechecker/TypeCheckerStructDefinitionTests.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenFieldLoadTests.java b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenFieldLoadTests.java index f4bb5152..31fe60c0 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenFieldLoadTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenFieldLoadTests.java @@ -29,8 +29,8 @@ public class PatioCodeGenFieldLoadTests { Map.entry("y", Types.INT), Map.entry("z", Types.INT) )) - .toTypeInfo(); - var context = PatioCodeGenContext.forTypeInfo(typeInfo) + .toTypeInfos(); + var context = PatioCodeGenContext.forTypeInfos(typeInfo) .temporaryPush(new PatioLocalRef("a")) .temporaryPush(new PatioLocalRef("b")); diff --git a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceFieldStoreTests.java b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceFieldStoreTests.java index 7eb1b252..1e2a66a9 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceFieldStoreTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceFieldStoreTests.java @@ -29,8 +29,8 @@ public class PatioCodeGenNamespaceFieldStoreTests { Map.entry("y", Types.INT), Map.entry("z", Types.INT) )) - .toTypeInfo(); - var context = PatioCodeGenContext.forTypeInfo(typeInfo) + .toTypeInfos(); + var context = PatioCodeGenContext.forTypeInfos(typeInfo) .temporaryPush(new PatioLocalRef("a")) .temporaryPush(new PatioLocalRef("b")); diff --git a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java index 3b42046c..d02c1429 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioCodeGenNamespaceTests.java @@ -10,7 +10,7 @@ import org.shedlang.compiler.stackir.instructions.Instruction; import org.shedlang.compiler.stackir.instructions.Instructions; import org.shedlang.compiler.testing.snapshots.SnapshotResolver; import org.shedlang.compiler.testing.snapshots.Snapshotter; -import org.shedlang.compiler.typechecker.TypeInfo; +import org.shedlang.compiler.typechecker.TypeInfos; import org.shedlang.compiler.types.NamespaceName; import org.shedlang.compiler.types.NamespaceTypeInfo; import org.shedlang.compiler.types.Types; @@ -39,7 +39,7 @@ public class PatioCodeGenNamespaceTests { ); var instructions = List.of(instruction); var namespaceName = NamespaceName.of("An","Example"); - var context = PatioCodeGenContext.forTypeInfo(new TypeInfo(P.map( + var context = PatioCodeGenContext.forTypeInfos(new TypeInfos(P.map( Map.entry(namespaceName, new NamespaceTypeInfo(P.orderedMap( Map.entry("x", Types.INT), Map.entry("y", Types.STRING) diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java index 818c026f..e8628411 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java @@ -114,7 +114,7 @@ public class TypeCheckerStructDefinitionTests { var typed = typeCheckNamespaceStatement(untyped, context); assertThat( - typed.context().structTypeInfo().get(Types.struct(NAMESPACE_NAME, "ExampleStruct")), + typed.context().structTypeInfos().get(Types.struct(NAMESPACE_NAME, "ExampleStruct")), // TODO: builder for OrderedPMap has("fields", x -> x.fields().entrySet(), isSequence( equalTo(Map.entry("b", Types.BOOL)), -- cgit v1.2.3