Introduce Type interface

2 files changed, 6 insertions, 3 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 902febd..73576dd 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
@@ -3,6 +3,7 @@ package org.zwobble.couscous.tests.interpreter;
 import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 import org.zwobble.couscous.ast.*;
+import org.zwobble.couscous.ast.types.ScalarType;
 import org.zwobble.couscous.interpreter.Environment;
 import org.zwobble.couscous.interpreter.JavaProject;
 import org.zwobble.couscous.interpreter.MapBackedProject;
@@ -171,7 +172,7 @@ public class EvaluatorTests extends BackendEvalTests {
 
     @Test
     public void cannotSetValueOfInstanceFieldAsThoughItIsAStaticField() {
-        TypeName type = TypeName.of("com.example.Example");
+        ScalarType type = ScalarType.of("com.example.Example");
         ClassNode classNode = ClassNode.builder(type)
             .field("value", IntegerValue.REF)
             .constructor(constructor -> constructor
diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
index c8dd2fb..d9cef51 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
@@ -2,6 +2,8 @@ package org.zwobble.couscous.tests.interpreter;
 
 import org.junit.Test;
 import org.zwobble.couscous.ast.*;
+import org.zwobble.couscous.ast.types.ScalarType;
+import org.zwobble.couscous.ast.types.Type;
 import org.zwobble.couscous.interpreter.Interpreter;
 import org.zwobble.couscous.interpreter.JavaProject;
 import org.zwobble.couscous.interpreter.Project;
@@ -106,10 +108,10 @@ public class InterpreterMethodTests extends BackendMethodTests {
             @Override
             public PrimitiveValue runMethod(
                 List<TypeNode> classNodes,
-                TypeName className,
+                ScalarType className,
                 String methodName,
                 List<PrimitiveValue> arguments,
-                TypeName returnType) {
+                Type returnType) {
                 
                 Project project = JavaProject.of(classNodes);
                 Interpreter interpreter = new Interpreter(project);