From 38384f004445b8a25489e0a281c2d5dc7475c591 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 4 Nov 2023 17:08:47 +0000
Subject: Rename effect functions to effect fields

---
 .../ast/untyped/UntypedEffectDefinitionNodeMatcher.java      |  6 +++---
 .../shedlang/compiler/ast/untyped/UntypedNodeMatchers.java   |  2 +-
 .../compiler/parser/ParserEffectDefinitionTests.java         | 12 ++++++------
 .../typechecker/TypeCheckerEffectDefinitionTests.java        |  8 ++++----
 4 files changed, 14 insertions(+), 14 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 3f32cb2f..34efd64a 100644
--- a/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java
+++ b/src/test/java/org/shedlang/compiler/ast/untyped/UntypedEffectDefinitionNodeMatcher.java
@@ -44,9 +44,9 @@ public class UntypedEffectDefinitionNodeMatcher extends MatcherBuilder<
         return with(has("visibility", x -> x.visibility(), equalTo(visibility)));
     }
 
-    public UntypedEffectDefinitionNodeMatcher withFunctions(
-        Matcher<Iterable<? extends UntypedEffectDefinitionFunctionNode>> functions
+    public UntypedEffectDefinitionNodeMatcher withFields(
+        Matcher<Iterable<? extends UntypedEffectDefinitionFieldNode>> fields
     ) {
-        return with(has("functions", x -> x.functions(), functions));
+        return with(has("fields", x -> x.fields(), 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 ea21a693..61fad9ac 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<UntypedEffectDefinitionFunctionNode> isUntypedEffectDefinitionFunctionNode(
+    public static Matcher<UntypedEffectDefinitionFieldNode> isUntypedEffectDefinitionFieldNode(
         String name,
         Matcher<? super UntypedFunctionTypeNode> type
     ) {
diff --git a/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java b/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java
index 03204719..fce92263 100644
--- a/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/parser/ParserEffectDefinitionTests.java
@@ -53,7 +53,7 @@ public class ParserEffectDefinitionTests {
     }
 
     @Test
-    public void canParseEffectWithNoFunctions() {
+    public void canParseEffectWithNoFields() {
         var source = """
             effect State {
             }""";
@@ -63,12 +63,12 @@ public class ParserEffectDefinitionTests {
         assertThat(
             node,
             isUntypedEffectDefinitionNode()
-                .withFunctions(isSequence())
+                .withFields(isSequence())
         );
     }
 
     @Test
-    public void canParseEffectFunctions() {
+    public void canParseEffectFields() {
         var source = """
             effect State {
                 fun get() -> Int;
@@ -80,14 +80,14 @@ public class ParserEffectDefinitionTests {
         assertThat(
             node,
             isUntypedEffectDefinitionNode()
-                .withFunctions(isSequence(
-                    isUntypedEffectDefinitionFunctionNode(
+                .withFields(isSequence(
+                    isUntypedEffectDefinitionFieldNode(
                         "get",
                         isUntypedFunctionTypeNode()
                             .withParams(isUntypedFunctionTypeParamsNode(isSequence(), isSequence()))
                             .withReturnType(isUntypedTypeLevelReferenceNode("Int"))
                     ),
-                    isUntypedEffectDefinitionFunctionNode(
+                    isUntypedEffectDefinitionFieldNode(
                         "set",
                         isUntypedFunctionTypeNode()
                             .withParams(isUntypedFunctionTypeParamsNode(
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java
index bf99f75c..d5603730 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerEffectDefinitionTests.java
@@ -55,16 +55,16 @@ public class TypeCheckerEffectDefinitionTests {
     }
 
     @Test
-    public void effectInfoHasFunctions() {
+    public void effectInfoHasFields() {
         var untyped = UntypedEffectDefinitionNode.builder()
             .withName("ExampleEffect")
-            .addFunction(
+            .addField(
                 "b",
                 UntypedFunctionTypeNode.builder()
                     .withReturnType(Untyped.typeLevelReference("String"))
                     .build()
             )
-            .addFunction(
+            .addField(
                 "a",
                 UntypedFunctionTypeNode.builder()
                     .withReturnType(Untyped.typeLevelReference("Bool"))
@@ -81,7 +81,7 @@ public class TypeCheckerEffectDefinitionTests {
 
         assertThat(
             typed.context().userDefinedEffectInfo(Effects.userDefined(NAMESPACE_NAME, "ExampleEffect"), Sources.NULL),
-            has("functions", x -> x.functions().stream().toList(), isSequence(
+            has("fields", x -> x.fields().stream().toList(), isSequence(
                 equalTo(Map.entry("b", FunctionType.builder().withReturnType(Types.STRING).build())),
                 equalTo(Map.entry("a", FunctionType.builder().withReturnType(Types.BOOL).build()))
             ))
-- 
cgit v1.2.3