From dcfcdb2b408f05ab6b5d5ca8713c10af4ff80495 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 25 Oct 2023 22:14:56 +0100
Subject: Clarify declaration vs definition

---
 .../compiler/typechecker/TypeCheckerContextTests.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/test/java')

diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerContextTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerContextTests.java
index aa06e499..7d2bac3e 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerContextTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerContextTests.java
@@ -2,9 +2,9 @@ package org.shedlang.compiler.typechecker;
 
 import org.junit.jupiter.api.Test;
 import org.shedlang.compiler.sources.Sources;
-import org.shedlang.compiler.typechecker.errors.CannotDefineVariableDeclaredInOuterScopeError;
+import org.shedlang.compiler.typechecker.errors.CannotDeclareTypeOfVariableDeclaredInOuterScopeError;
 import org.shedlang.compiler.typechecker.errors.UnknownVariableError;
-import org.shedlang.compiler.typechecker.errors.VariableIsAlreadyDefinedError;
+import org.shedlang.compiler.typechecker.errors.VariableAlreadyHasTypeError;
 import org.shedlang.compiler.types.NamespaceName;
 import org.shedlang.compiler.types.Types;
 import org.shedlang.compiler.util.P;
@@ -24,7 +24,7 @@ public class TypeCheckerContextTests {
                 Map.entry("y", Variable.undefined(VariableType.VAL))
             ));
 
-        context = context.define("x", Types.STRING, Sources.NULL);
+        context = context.declareVariableType("x", Types.STRING, Sources.NULL);
         var result = context.runtimeLookup("x", Sources.NULL);
 
         assertThat(result.value(), isOptionalOf(equalTo(Variable.defined(Types.STRING, VariableType.VAL))));
@@ -39,7 +39,7 @@ public class TypeCheckerContextTests {
 
         var error = assertThrows(
             UnknownVariableError.class,
-            () -> context.define("x", Types.STRING, Sources.NULL)
+            () -> context.declareVariableType("x", Types.STRING, Sources.NULL)
         );
 
         assertThat(error.variableName(), equalTo("x"));
@@ -53,8 +53,8 @@ public class TypeCheckerContextTests {
             ));
 
         var error = assertThrows(
-            VariableIsAlreadyDefinedError.class,
-            () -> context.define("x", Types.STRING, Sources.NULL)
+            VariableAlreadyHasTypeError.class,
+            () -> context.declareVariableType("x", Types.STRING, Sources.NULL)
         );
 
         assertThat(error.variableName(), equalTo("x"));
@@ -69,8 +69,8 @@ public class TypeCheckerContextTests {
             .enterNamespace(NamespaceName.of("Example"), P.map());
 
         var error = assertThrows(
-            CannotDefineVariableDeclaredInOuterScopeError.class,
-            () -> context.define("x", Types.STRING, Sources.NULL)
+            CannotDeclareTypeOfVariableDeclaredInOuterScopeError.class,
+            () -> context.declareVariableType("x", Types.STRING, Sources.NULL)
         );
 
         assertThat(error.variableName(), equalTo("x"));
@@ -87,7 +87,7 @@ public class TypeCheckerContextTests {
         context = context.enterBlock(P.map(
             Map.entry("x", Variable.undefined(VariableType.VAL))
         ));
-        context = context.define("x", Types.STRING, Sources.NULL);
+        context = context.declareVariableType("x", Types.STRING, Sources.NULL);
         assertThat(
             context.runtimeLookup("x", Sources.NULL).value(),
             isOptionalOf(equalTo(Variable.defined(Types.STRING, VariableType.VAL)))
-- 
cgit v1.2.3