From 1871e5690e5d6a61f08e722dacc5dfdbae7ed714 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 19 Nov 2023 10:58:57 +0000 Subject: Add field index to FieldInfo --- .../typechecker/TypeCheckerEffectDefinitionTests.java | 4 ++-- .../typechecker/TypeCheckerStructDefinitionTests.java | 4 ++-- .../java/org/shedlang/compiler/types/FieldsInfoTests.java | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java index 7891761e..5f435ce0 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java @@ -78,8 +78,8 @@ public class TypeCheckerEffectDefinitionTests { assertThat( typed.context().userDefinedEffectInfo(Effects.userDefined(NAMESPACE_NAME, "ExampleEffect"), Sources.NULL), has("methods", x -> x.methods(), isSequence( - equalTo(new FieldInfo<>("b", FunctionType.builder().withReturnType(Types.STRING).build())), - equalTo(new FieldInfo<>("a", FunctionType.builder().withReturnType(Types.BOOL).build())) + equalTo(new FieldInfo<>(0, "b", FunctionType.builder().withReturnType(Types.STRING).build())), + equalTo(new FieldInfo<>(1, "a", FunctionType.builder().withReturnType(Types.BOOL).build())) )) ); } diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java index 63a7dfae..1f8af21d 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerStructDefinitionTests.java @@ -120,8 +120,8 @@ public class TypeCheckerStructDefinitionTests { assertThat( structTypeInfo, has("fields", x -> x.fields(), isSequence( - equalTo(new FieldInfo<>("b", Types.BOOL)), - equalTo(new FieldInfo<>("a", Types.INT)) + equalTo(new FieldInfo<>(0, "b", Types.BOOL)), + equalTo(new FieldInfo<>(1, "a", Types.INT)) )) ); } diff --git a/src/test/java/org/shedlang/compiler/types/FieldsInfoTests.java b/src/test/java/org/shedlang/compiler/types/FieldsInfoTests.java index 48bb46ff..83e41d68 100644 --- a/src/test/java/org/shedlang/compiler/types/FieldsInfoTests.java +++ b/src/test/java/org/shedlang/compiler/types/FieldsInfoTests.java @@ -10,8 +10,8 @@ public class FieldsInfoTests { @Test public void fieldCountReturnsNumberOfFields() { var namespaceTypeInfo = FieldsInfo.of( - new FieldInfo<>("a", Types.INT), - new FieldInfo<>("b", Types.STRING) + FieldsInfo.freeField("a", Types.INT), + FieldsInfo.freeField("b", Types.STRING) ); var result = namespaceTypeInfo.fieldCount(); @@ -22,8 +22,8 @@ public class FieldsInfoTests { @Test public void fieldIndexReturnsIndexOfFieldInMap() { var namespaceTypeInfo = FieldsInfo.of( - new FieldInfo<>("a", Types.INT), - new FieldInfo<>("b", Types.STRING) + FieldsInfo.freeField("a", Types.INT), + FieldsInfo.freeField("b", Types.STRING) ); var result = namespaceTypeInfo.fieldIndex("b"); @@ -34,8 +34,8 @@ public class FieldsInfoTests { @Test public void whenFieldDoesNotExistThenFieldIndexThrowsError() { var namespaceTypeInfo = FieldsInfo.of( - new FieldInfo<>("a", Types.INT), - new FieldInfo<>("b", Types.STRING) + FieldsInfo.freeField("a", Types.INT), + FieldsInfo.freeField("b", Types.STRING) ); var error = assertThrows( -- cgit v1.2.3