Extract Variable to be top-level interface

4 files changed, 17 insertions, 17 deletions

diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java
index 21ebfbc3..1f5d82ee 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerAssignTests.java
@@ -24,7 +24,7 @@ public class TypeCheckerAssignTests {
         var untyped = Untyped.assign(Untyped.targetVariable("x"), Untyped.stringLiteral("hello"));
         var context = TypeCheckerContext.EMPTY
             .enterNamespace(P.map(
-                Map.entry("x", TypeCheckerContext.defined(Types.STRING))
+                Map.entry("x", Variable.defined(Types.STRING))
             ));
 
         var typed = typeCheckFunctionStatement(untyped, context);
@@ -40,7 +40,7 @@ public class TypeCheckerAssignTests {
         var untyped = Untyped.assign(Untyped.targetVariable("x"), Untyped.stringLiteral("hello"));
         var context = TypeCheckerContext.EMPTY
             .enterNamespace(P.map(
-                Map.entry("x", TypeCheckerContext.defined(Types.INT))
+                Map.entry("x", Variable.defined(Types.INT))
             ));
 
         var error = assertThrows(
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerCallTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerCallTests.java
index 33cfda12..59576069 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerCallTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerCallTests.java
@@ -307,7 +307,7 @@ public class TypeCheckerCallTests {
             .build();
         var context = TypeCheckerContext.EMPTY
             .enterFunction(
-                P.map(Map.entry("f", TypeCheckerContext.defined(functionType))),
+                P.map(Map.entry("f", Variable.defined(functionType))),
                 Effects.IO,
                 Types.UNIT
             );
@@ -334,7 +334,7 @@ public class TypeCheckerCallTests {
             .build();
         var context = TypeCheckerContext.EMPTY
             .enterFunction(
-                P.map(Map.entry("f", TypeCheckerContext.defined(functionType))),
+                P.map(Map.entry("f", Variable.defined(functionType))),
                 Effects.NONE,
                 Types.UNIT
             );
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerContextTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerContextTests.java
index a9198b86..3c622348 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerContextTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerContextTests.java
@@ -19,21 +19,21 @@ public class TypeCheckerContextTests {
     public void givenVariableIsUndefinedWhenVariableIsDefinedThenVariableHasTypeSet() {
         var context = TypeCheckerContext.EMPTY
             .enterNamespace(P.map(
-                Map.entry("x", TypeCheckerContext.undefined()),
-                Map.entry("y", TypeCheckerContext.undefined())
+                Map.entry("x", Variable.undefined()),
+                Map.entry("y", Variable.undefined())
             ));
 
         context = context.define("x", Types.STRING, Sources.NULL);
         var result = context.runtimeLookup("x", Sources.NULL);
 
-        assertThat(result.value(), isOptionalOf(equalTo(TypeCheckerContext.defined(Types.STRING))));
+        assertThat(result.value(), isOptionalOf(equalTo(Variable.defined(Types.STRING))));
     }
 
     @Test
     public void givenVariableIsUnknownWhenVariableIsDefinedThenErrorIsThrown() {
         var context = TypeCheckerContext.EMPTY
             .enterNamespace(P.map(
-                Map.entry("y", TypeCheckerContext.undefined())
+                Map.entry("y", Variable.undefined())
             ));
 
         var error = assertThrows(
@@ -48,7 +48,7 @@ public class TypeCheckerContextTests {
     public void givenVariableIsDefinedWhenVariableIsDefinedThenErrorIsThrown() {
         var context = TypeCheckerContext.EMPTY
             .enterNamespace(P.map(
-                Map.entry("x", TypeCheckerContext.defined(Types.STRING))
+                Map.entry("x", Variable.defined(Types.STRING))
             ));
 
         var error = assertThrows(
@@ -63,7 +63,7 @@ public class TypeCheckerContextTests {
     public void givenVariableIsBoundInOuterScopeWhenVariableIsDefinedThenErrorIsThrown() {
         var context = TypeCheckerContext.EMPTY
             .enterNamespace(P.map(
-                Map.entry("x", TypeCheckerContext.undefined())
+                Map.entry("x", Variable.undefined())
             ))
             .enterNamespace(P.map());
 
@@ -79,23 +79,23 @@ public class TypeCheckerContextTests {
     public void definingVariableOnlyAffectsTopMostLexicalContext() {
         var context = TypeCheckerContext.EMPTY
             .enterNamespace(P.map(
-                Map.entry("x", TypeCheckerContext.undefined()),
-                Map.entry("y", TypeCheckerContext.undefined())
+                Map.entry("x", Variable.undefined()),
+                Map.entry("y", Variable.undefined())
             ));
 
         context = context.enterBlock(P.map(
-            Map.entry("x", TypeCheckerContext.undefined())
+            Map.entry("x", Variable.undefined())
         ));
         context = context.define("x", Types.STRING, Sources.NULL);
         assertThat(
             context.runtimeLookup("x", Sources.NULL).value(),
-            isOptionalOf(equalTo(TypeCheckerContext.defined(Types.STRING)))
+            isOptionalOf(equalTo(Variable.defined(Types.STRING)))
         );
 
         context = context.exit();
         assertThat(
             context.runtimeLookup("x", Sources.NULL).value(),
-            isOptionalOf(equalTo(TypeCheckerContext.undefined()))
+            isOptionalOf(equalTo(Variable.undefined()))
         );
     }
 
@@ -104,7 +104,7 @@ public class TypeCheckerContextTests {
         var context = TypeCheckerContext.EMPTY
             .enterBlock(P.map())
             .enterBlock(P.map(
-                Map.entry("x", TypeCheckerContext.undefined())
+                Map.entry("x", Variable.undefined())
             ))
             .enterBlock(P.map())
             .enterBlock(P.map());
diff --git a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIfTests.java b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIfTests.java
index a52fdfac..69ae78af 100644
--- a/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIfTests.java
+++ b/src/test/java/org/shedlang/compiler/typechecker/TypeCheckerIfTests.java
@@ -129,7 +129,7 @@ public class TypeCheckerIfTests {
         );
         var context = TypeCheckerContext.EMPTY
             .enterNamespace(P.map(
-                Map.entry("x", TypeCheckerContext.defined(Types.STRING))
+                Map.entry("x", Variable.defined(Types.STRING))
             ));
 
         var result = TypeChecker.typeCheckExpression(untyped, context);