Rename NoSuchFieldError to NoSuchMemberError

5 files changed, 35 insertions, 35 deletions

diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index 181d41e3..ed522427 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -5,7 +5,7 @@ import org.shedlang.compiler.ast.typed.*;
 import org.shedlang.compiler.ast.untyped.*;
 import org.shedlang.compiler.sources.Source;
 import org.shedlang.compiler.sources.Sources;
-import org.shedlang.compiler.typechecker.errors.NoSuchFieldError;
+import org.shedlang.compiler.typechecker.errors.NoSuchMemberError;
 import org.shedlang.compiler.typechecker.errors.*;
 import org.shedlang.compiler.typechecker.typesets.TypeSetTypeLevelValue;
 import org.shedlang.compiler.typechecker.typesets.TypeSets;
@@ -1335,7 +1335,7 @@ public class TypeChecker {
         TypeCheckerContext context
     ) {
         return memberTypeOrEmpty(receiverType, memberName, source, context)
-            .orElseThrow(() -> new NoSuchFieldError(receiverType, memberName, source));
+            .orElseThrow(() -> new NoSuchMemberError(receiverType, memberName, source));
     }
 
     private static Optional<Type> memberTypeOrEmpty(
@@ -2144,7 +2144,7 @@ public class TypeChecker {
 
             var effectFieldType = effectInfo
                 .methodType(untypedHandlerMethod.name())
-                .orElseThrow(() -> new NoSuchFieldError(
+                .orElseThrow(() -> new NoSuchMemberError(
                     Types.effectType(handledEffect),
                     untypedHandlerMethod.name(),
                     untypedHandlerMethod.source()
diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/NoSuchFieldError.java b/src/main/java/org/shedlang/compiler/typechecker/errors/NoSuchFieldError.java
deleted file mode 100644
index ce18ebb3..00000000
--- a/src/main/java/org/shedlang/compiler/typechecker/errors/NoSuchFieldError.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.shedlang.compiler.typechecker.errors;
-
-import org.shedlang.compiler.errors.SourceError;
-import org.shedlang.compiler.sources.Source;
-import org.shedlang.compiler.types.Type;
-
-public class NoSuchFieldError extends SourceError {
-    private final Type type;
-    private final String fieldName;
-
-    public NoSuchFieldError(Type type, String fieldName, Source source) {
-        super("No field named " + fieldName + " on type " + type.describe(), source);
-        this.type = type;
-        this.fieldName = fieldName;
-    }
-
-    public Type type() {
-        return type;
-    }
-
-    public String fieldName() {
-        return fieldName;
-    }
-}
diff --git a/src/main/java/org/shedlang/compiler/typechecker/errors/NoSuchMemberError.java b/src/main/java/org/shedlang/compiler/typechecker/errors/NoSuchMemberError.java
new file mode 100644
index 00000000..8e207306
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/typechecker/errors/NoSuchMemberError.java
@@ -0,0 +1,24 @@
+package org.shedlang.compiler.typechecker.errors;
+
+import org.shedlang.compiler.errors.SourceError;
+import org.shedlang.compiler.sources.Source;
+import org.shedlang.compiler.types.Type;
+
+public class NoSuchMemberError extends SourceError {
+    private final Type type;
+    private final String memberName;
+
+    public NoSuchMemberError(Type type, String memberName, Source source) {
+        super("No member named " + memberName + " on type " + type.describe(), source);
+        this.type = type;
+        this.memberName = memberName;
+    }
+
+    public Type type() {
+        return type;
+    }
+
+    public String memberName() {
+        return memberName;
+    }
+}
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerMemberAccessTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerMemberAccessTests.java
index 7c794243..1ed1aabe 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerMemberAccessTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerMemberAccessTests.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.typechecker.errors.MissingStructTypeInfoError;
-import org.shedlang.compiler.typechecker.errors.NoSuchFieldError;
+import org.shedlang.compiler.typechecker.errors.NoSuchMemberError;
 import org.shedlang.compiler.types.*;
 import org.shedlang.compiler.util.P;
 
@@ -193,10 +193,10 @@ public class TypeCheckerMemberAccessTests {
         var context = TypeCheckerContext.EMPTY
             .enterGlobal(P.map(Map.entry("user", Types.STRING)));
 
-        var error = assertThrows(NoSuchFieldError.class, () -> typeCheckExpression(untyped, context));
+        var error = assertThrows(NoSuchMemberError.class, () -> typeCheckExpression(untyped, context));
 
         assertThat(error.type(), equalTo(Types.STRING));
-        assertThat(error.fieldName(), equalTo("name"));
+        assertThat(error.memberName(), equalTo("name"));
     }
 
     @Test
@@ -213,10 +213,10 @@ public class TypeCheckerMemberAccessTests {
             .enterGlobal(P.map(Map.entry("user", structType)))
             .addStructTypeInfo(structType, structTypeInfo);
 
-        var error = assertThrows(NoSuchFieldError.class, () -> typeCheckExpression(untyped, context));
+        var error = assertThrows(NoSuchMemberError.class, () -> typeCheckExpression(untyped, context));
 
         assertThat(error.type(), equalTo(structType));
-        assertThat(error.fieldName(), equalTo("name"));
+        assertThat(error.memberName(), equalTo("name"));
     }
 
     @Test
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java
index 7c1c9bf3..bc11ab4b 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerTryTests.java
@@ -5,7 +5,7 @@ import org.shedlang.compiler.ast.untyped.Untyped;
 import org.shedlang.compiler.ast.untyped.UntypedCallNode;
 import org.shedlang.compiler.ast.untyped.UntypedTryHandlerMethodNode;
 import org.shedlang.compiler.ast.untyped.UntypedTryNode;
-import org.shedlang.compiler.typechecker.errors.NoSuchFieldError;
+import org.shedlang.compiler.typechecker.errors.NoSuchMemberError;
 import org.shedlang.compiler.typechecker.errors.*;
 import org.shedlang.compiler.typechecker.typesets.TypeSets;
 import org.shedlang.compiler.types.*;
@@ -287,11 +287,11 @@ public class TypeCheckerTryTests {
             );
 
         var error = assertThrows(
-            NoSuchFieldError.class,
+            NoSuchMemberError.class,
             () -> typeCheckExpression(untyped, context)
         );
 
-        assertThat(error.fieldName(), equalTo("mark"));
+        assertThat(error.memberName(), equalTo("mark"));
     }
 
     @Test