Use type references instead of deferred types

2 files changed, 4 insertions, 4 deletions

diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
index b4e5be3..7656e89 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
@@ -32,7 +32,7 @@ import lombok.val;
 public class EvaluatorTests {
     @Test
     public void valueOfAssignmentExpressionIsNewValue() {
-        val arg = new FormalArgumentNode(42, () -> StringValue.TYPE, "x");
+        val arg = new FormalArgumentNode(42, StringValue.REF, "x");
         val environment = new Environment(
             new MapBackedProject(ImmutableMap.of()),
             ImmutableMap.of(arg.getId(), new StringValue("[initial value]")));
@@ -97,7 +97,7 @@ public class EvaluatorTests {
         val exception = assertThrows(UnexpectedValueType.class,
             () -> eval(emptyEnvironment(),
                 methodCall(literal("hello"), "substring", literal(0), literal(""))));
-        assertEquals(new UnexpectedValueType(IntegerValue.TYPE, StringValue.TYPE), exception);
+        assertEquals(new UnexpectedValueType(IntegerValue.REF, StringValue.REF), exception);
     }
     
     @Test
diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java
index d187c20..87659b8 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java
@@ -46,7 +46,7 @@ public class InterpreterTests {
     
     @Test
     public void canPassValueToMethod() {
-        val arg = new FormalArgumentNode(42, () -> StringValue.TYPE, "x");
+        val arg = new FormalArgumentNode(42, StringValue.REF, "x");
         val method = staticMethod("hello")
             .argument(arg)
             .statement(new ReturnNode(reference(arg)));
@@ -67,7 +67,7 @@ public class InterpreterTests {
     
     @Test
     public void canReassignValueToArgument() {
-        val arg = new FormalArgumentNode(42, () -> StringValue.TYPE, "x");
+        val arg = new FormalArgumentNode(42, StringValue.REF, "x");
         val method = staticMethod("hello")
             .argument(arg)
             .statement(new ExpressionStatementNode(new Assignment(reference(arg), LiteralNode.literal("[updated value]"))))