Move standard type definitions into a Types class

2 files changed, 7 insertions, 9 deletions

diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
index 2ca3b2d..fbc3c54 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpMethodRunner.java
@@ -14,11 +14,10 @@ import org.zwobble.couscous.backends.csharp.CsharpBackend;
 import org.zwobble.couscous.backends.csharp.CsharpSerializer;
 import org.zwobble.couscous.tests.MethodRunner;
 import org.zwobble.couscous.tests.backends.Processes;
+import org.zwobble.couscous.types.Types;
 import org.zwobble.couscous.util.ExtraLists;
 import org.zwobble.couscous.values.PrimitiveValue;
 import org.zwobble.couscous.values.PrimitiveValues;
-import org.zwobble.couscous.values.StringValue;
-import org.zwobble.couscous.values.UnitValue;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -72,7 +71,7 @@ public class CsharpMethodRunner implements MethodRunner {
                 eagerMap(arguments, LiteralNode::literal),
                 returnType));
 
-        boolean isVoid = returnType.equals(UnitValue.REF);
+        boolean isVoid = returnType.equals(Types.VOID);
         String body = isVoid
             ? value + ";"
             : "var value = " + value + ";" +
@@ -123,7 +122,7 @@ public class CsharpMethodRunner implements MethodRunner {
                 return value(value.equals("True"));
             case "System.MonoType":
                 if (value.equals("System.String")) {
-                    return value(StringValue.REF);
+                    return value(Types.STRING);
                 } else {
                     assertThat(value, Matchers.startsWith(NAMESPACE_PREFIX));
                     return value(ScalarType.of(value.substring(NAMESPACE_PREFIX.length())));
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java
index 3eebf1a..5c1044d 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java
@@ -5,8 +5,7 @@ import org.zwobble.couscous.ast.*;
 import org.zwobble.couscous.types.ScalarType;
 import org.zwobble.couscous.backends.csharp.CsharpSerializer;
 import org.zwobble.couscous.tests.TestIds;
-import org.zwobble.couscous.values.BooleanValue;
-import org.zwobble.couscous.values.IntegerValue;
+import org.zwobble.couscous.types.Types;
 
 import static org.junit.Assert.assertEquals;
 import static org.zwobble.couscous.ast.AssignmentNode.assign;
@@ -71,7 +70,7 @@ public class CsharpSerializerTests {
     @Test
     public void assignmentSeparatesTargetAndValueWithEqualsSign() {
         String output = serialize(assign(
-            reference(var(TestIds.ANY_ID, "x", BooleanValue.REF)),
+            reference(var(TestIds.ANY_ID, "x", Types.BOOLEAN)),
             literal(true)));
         assertEquals("x = true", output);
     }
@@ -131,7 +130,7 @@ public class CsharpSerializerTests {
     @Test
     public void prefixExpression() {
         String output = serialize(not(
-            reference(var(TestIds.ANY_ID, "x", BooleanValue.REF))));
+            reference(var(TestIds.ANY_ID, "x", Types.BOOLEAN))));
         assertEquals("!x", output);
     }
 
@@ -360,7 +359,7 @@ public class CsharpSerializerTests {
 
     @Test
     public void interfaceWithMethod() {
-        MethodNode method = MethodNode.builder("get").isAbstract().returns(IntegerValue.REF).build();
+        MethodNode method = MethodNode.builder("get").isAbstract().returns(Types.INT).build();
         Node node = new ClassNodeBuilder(ScalarType.of("com.example.Example"))
             .method(method)
             .buildInterface();