Rename effect fields to effect methods

6 files changed, 23 insertions, 23 deletions

diff --git a/src/test/java/org/shedlang/compiler/ast/typed/TypedTryNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/typed/TypedTryNodeMatcher.java
index 08e203fd..6998f85a 100644
--- a/src/test/java/org/shedlang/compiler/ast/typed/TypedTryNodeMatcher.java
+++ b/src/test/java/org/shedlang/compiler/ast/typed/TypedTryNodeMatcher.java
@@ -38,9 +38,9 @@ public class TypedTryNodeMatcher extends MatcherBuilder<
         return with(has("body", x -> x.body(), body));
     }
 
-    public TypedTryNodeMatcher withHandlerFields(
-        Matcher<? super Iterable<TypedFunctionDefinitionNode>> handlerFields
+    public TypedTryNodeMatcher withHandlerMethods(
+        Matcher<? super Iterable<TypedFunctionDefinitionNode>> handlerMethods
     ) {
-        return with(has("handlerFields", x -> x.handlerFields(), handlerFields));
+        return with(has("handlerMethods", x -> x.handlerMethods(), handlerMethods));
     }
 }
diff --git a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedTryNodeMatcher.java b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedTryNodeMatcher.java
index 5a3ab9f0..eac572ab 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedTryNodeMatcher.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedTryNodeMatcher.java
@@ -42,9 +42,9 @@ public class UntypedTryNodeMatcher extends MatcherBuilder<
         return with(has("handledEffect", x -> x.handledEffect(), handledEffect));
     }
 
-    public UntypedTryNodeMatcher withHandlerFields(
-        Matcher<Iterable<? extends UntypedFunctionDefinitionNode>> handlerFields
+    public UntypedTryNodeMatcher withHandlerMethods(
+        Matcher<Iterable<? extends UntypedFunctionDefinitionNode>> handlerMethods
     ) {
-        return with(has("handlerFields", x -> x.handlerFields(), handlerFields));
+        return with(has("handlerMethods", x -> x.handlerMethods(), handlerMethods));
     }
 }
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserTryTests.java b/src/test/java/org/shedlang/compiler/parser/ParserTryTests.java
index 6f5d8c83..0782cdd4 100644
--- a/src/test/java/org/shedlang/compiler/parser/ParserTryTests.java
+++ b/src/test/java/org/shedlang/compiler/parser/ParserTryTests.java
@@ -31,7 +31,7 @@ public class ParserTryTests {
                     isUntypedExpressionStatementNode(isUntypedIntLiteralNode(1))
                 )))
                 .withHandledEffect(isUntypedTypeLevelReferenceNode("State"))
-                .withHandlerFields(isSequence(
+                .withHandlerMethods(isSequence(
                     isUntypedFunctionDefinitionNode()
                         .withName("read"),
                     isUntypedFunctionDefinitionNode()
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionResumeTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionResumeTests.java
index c3326020..7d28109d 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionResumeTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionResumeTests.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.typechecker;
 import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.ast.untyped.Untyped;
 import org.shedlang.compiler.ast.untyped.UntypedFunctionExpressionNode;
-import org.shedlang.compiler.typechecker.errors.CannotResumeOutsideOfEffectHandlerFieldError;
+import org.shedlang.compiler.typechecker.errors.CannotResumeOutsideOfEffectHandlerMethodError;
 import org.shedlang.compiler.typechecker.errors.UnexpectedTypeError;
 import org.shedlang.compiler.typechecker.typesets.TypeSets;
 import org.shedlang.compiler.types.Effects;
@@ -49,7 +49,7 @@ public class TypeCheckerFunctionResumeTests {
             .enterNamespace(NamespaceName.of("Example"), P.map());
 
         assertThrows(
-            CannotResumeOutsideOfEffectHandlerFieldError.class,
+            CannotResumeOutsideOfEffectHandlerMethodError.class,
             () -> TypeChecker.typeCheckFunctionStatement(untyped, context)
         );
     }
@@ -61,7 +61,7 @@ public class TypeCheckerFunctionResumeTests {
             .enterFunction(P.map(), Effects.NONE, ReturnTypeState.explicit(Types.STRING));
 
         assertThrows(
-            CannotResumeOutsideOfEffectHandlerFieldError.class,
+            CannotResumeOutsideOfEffectHandlerMethodError.class,
             () -> TypeChecker.typeCheckFunctionStatement(untyped, context)
         );
     }
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java
index 8fe03d32..f74b6d26 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerFunctionReturnTests.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.typechecker;
 import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.ast.untyped.Untyped;
 import org.shedlang.compiler.ast.untyped.UntypedFunctionExpressionNode;
-import org.shedlang.compiler.typechecker.errors.CannotReturnFromEffectHandlerFieldError;
+import org.shedlang.compiler.typechecker.errors.CannotReturnFromEffectHandlerMethodError;
 import org.shedlang.compiler.typechecker.errors.CannotReturnOutsideOfFunctionError;
 import org.shedlang.compiler.typechecker.errors.UnexpectedTypeError;
 import org.shedlang.compiler.typechecker.typesets.TypeSets;
@@ -62,7 +62,7 @@ public class TypeCheckerFunctionReturnTests {
             .enterFunction(P.map(), Effects.NONE, ReturnTypeState.effectHandler(Types.STRING));
 
         assertThrows(
-            CannotReturnFromEffectHandlerFieldError.class,
+            CannotReturnFromEffectHandlerMethodError.class,
             () -> TypeChecker.typeCheckFunctionStatement(untyped, context)
         );
     }
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java
index 169816dc..2a335d20 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java
@@ -163,7 +163,7 @@ public class TypeCheckerTryTests {
     }
 
     @Test
-    public void whenHandlerFieldIsMissingThenErrorIsThrown() {
+    public void whenHandlerMethodIsMissingThenErrorIsThrown() {
         var handledEffect = Effects.userDefined(NAMESPACE_NAME, "HandledEffect");
         var untyped = UntypedTryNode.builder()
             .withHandledEffect(Untyped.typeLevelReference(handledEffect.name()))
@@ -184,7 +184,7 @@ public class TypeCheckerTryTests {
             );
 
         var error = assertThrows(
-            MissingEffectHandlerFieldError.class,
+            MissingEffectHandlerMethodError.class,
             () -> typeCheckExpression(untyped, context)
         );
 
@@ -196,7 +196,7 @@ public class TypeCheckerTryTests {
         var handledEffect = Effects.userDefined(NAMESPACE_NAME, "HandledEffect");
         var untyped = UntypedTryNode.builder()
             .withHandledEffect(Untyped.typeLevelReference(handledEffect.name()))
-            .addHandlerField(
+            .addHandlerMethod(
                 UntypedFunctionDefinitionNode.builder()
                     .withName("mark")
                     .build()
@@ -225,11 +225,11 @@ public class TypeCheckerTryTests {
     }
 
     @Test
-    public void whenHandlerFieldTypeIsNotSubtypeOfEffectFieldTypeThenErrorIsThrown() {
+    public void whenHandlerMethodTypeIsNotSubtypeOfEffectFieldTypeThenErrorIsThrown() {
         var handledEffect = Effects.userDefined(NAMESPACE_NAME, "HandledEffect");
         var untyped = UntypedTryNode.builder()
             .withHandledEffect(Untyped.typeLevelReference(handledEffect.name()))
-            .addHandlerField(
+            .addHandlerMethod(
                 UntypedFunctionDefinitionNode.builder()
                     .addPositionalParam("x", Untyped.typeLevelReference("String"))
                     .addStatement(Untyped.resume())
@@ -272,11 +272,11 @@ public class TypeCheckerTryTests {
     }
 
     @Test
-    public void whenHandlerFieldTypeIsSubtypeOfEffectFieldTypeThenHandlerFieldTypeChecks() {
+    public void whenHandlerMethodTypeIsSubtypeOfEffectFieldTypeThenHandlerMethodTypeChecks() {
         var handledEffect = Effects.userDefined(NAMESPACE_NAME, "HandledEffect");
         var untyped = UntypedTryNode.builder()
             .withHandledEffect(Untyped.typeLevelReference(handledEffect.name()))
-            .addHandlerField(
+            .addHandlerMethod(
                 UntypedFunctionDefinitionNode.builder()
                     .addStatement(Untyped.resume())
                     .withName("mark")
@@ -303,7 +303,7 @@ public class TypeCheckerTryTests {
         assertThat(
             result.value(),
             isTypedTryNode()
-                .withHandlerFields(isSequence(
+                .withHandlerMethods(isSequence(
                     isTypedFunctionDefinitionNode()
                         .withName("mark")
                         .withBodyBlock(isTypedBlockNode(isSequence(
@@ -319,7 +319,7 @@ public class TypeCheckerTryTests {
         var unexpectedEffect = Effects.userDefined(NAMESPACE_NAME, "UnexpectedEffect");
         var untyped = UntypedTryNode.builder()
             .withHandledEffect(Untyped.typeLevelReference(handledEffect.name()))
-            .addHandlerField(
+            .addHandlerMethod(
                 UntypedFunctionDefinitionNode.builder()
                     .withName("effectField")
                     .addStatement(Untyped.expressionStatement(
@@ -363,7 +363,7 @@ public class TypeCheckerTryTests {
         var allowedEffect = Effects.userDefined(NAMESPACE_NAME, "AllowedEffect");
         var untyped = UntypedTryNode.builder()
             .withHandledEffect(Untyped.typeLevelReference(handledEffect.name()))
-            .addHandlerField(
+            .addHandlerMethod(
                 UntypedFunctionDefinitionNode.builder()
                     .withName("effectField")
                     .addStatement(Untyped.resume(
@@ -402,7 +402,7 @@ public class TypeCheckerTryTests {
         var handledEffect = Effects.userDefined(NAMESPACE_NAME, "HandledEffect");
         var untyped = UntypedTryNode.builder()
             .withHandledEffect(Untyped.typeLevelReference(handledEffect.name()))
-            .addHandlerField(
+            .addHandlerMethod(
                 UntypedFunctionDefinitionNode.builder()
                     .withName("effectField")
                     .addStatement(Untyped.expressionStatement(