From 965936c9d2983fae0201412df1d7adf4a1bc1c66 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 7 Nov 2023 18:59:44 +0000 Subject: Rename effect field to effect method --- .../compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java | 4 ++-- .../org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java | 2 +- .../compiler/typechecker/TypeCheckerEffectDefinitionTests.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java index 34efd64a..352ffa97 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java @@ -45,8 +45,8 @@ public class UntypedEffectDefinitionNodeMatcher extends MatcherBuilder< } public UntypedEffectDefinitionNodeMatcher withFields( - Matcher> fields + Matcher> fields ) { - return with(has("fields", x -> x.fields(), fields)); + return with(has("fields", x -> x.methods(), fields)); } } diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java index 61fad9ac..d2df2a3c 100644 --- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java +++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedNodeMatchers.java @@ -88,7 +88,7 @@ public class UntypedNodeMatchers { return UntypedEffectDefinitionNodeMatcher.empty(); } - public static Matcher isUntypedEffectDefinitionFieldNode( + public static Matcher isUntypedEffectDefinitionFieldNode( String name, Matcher type ) { diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java index 3c733e5a..70c674a9 100644 --- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java @@ -51,16 +51,16 @@ public class TypeCheckerEffectDefinitionTests { } @Test - public void effectInfoHasFields() { + public void effectInfoHasMethods() { var untyped = UntypedEffectDefinitionNode.builder() .withName("ExampleEffect") - .addField( + .addMethod( "b", UntypedFunctionTypeNode.builder() .withReturnType(Untyped.typeLevelReference("String")) .build() ) - .addField( + .addMethod( "a", UntypedFunctionTypeNode.builder() .withReturnType(Untyped.typeLevelReference("Bool")) @@ -77,7 +77,7 @@ public class TypeCheckerEffectDefinitionTests { assertThat( typed.context().userDefinedEffectInfo(Effects.userDefined(NAMESPACE_NAME, "ExampleEffect"), Sources.NULL), - has("fields", x -> x.fields().stream().toList(), isSequence( + has("methods", x -> x.methods().stream().toList(), isSequence( equalTo(new FieldInfo<>("b", FunctionType.builder().withReturnType(Types.STRING).build())), equalTo(new FieldInfo<>("a", FunctionType.builder().withReturnType(Types.BOOL).build())) )) -- cgit v1.2.3