Move standard type definitions into a Types class

6 files changed, 11 insertions, 23 deletions

diff --git a/src/main/java/org/zwobble/couscous/values/BooleanValue.java b/src/main/java/org/zwobble/couscous/values/BooleanValue.java
index 8d42e4f..8f7d95b 100644
--- a/src/main/java/org/zwobble/couscous/values/BooleanValue.java
+++ b/src/main/java/org/zwobble/couscous/values/BooleanValue.java
@@ -1,10 +1,9 @@
 package org.zwobble.couscous.values;
 
 import org.zwobble.couscous.types.ScalarType;
+import org.zwobble.couscous.types.Types;
 
 public final class BooleanValue implements PrimitiveValue {
-    public static final ScalarType REF = ScalarType.of("boolean");
-
     private final boolean value;
 
     public BooleanValue(final boolean value) {
@@ -22,7 +21,7 @@ public final class BooleanValue implements PrimitiveValue {
     
     @Override
     public ScalarType getType() {
-        return REF;
+        return Types.BOOLEAN;
     }
     
     @java.lang.Override
diff --git a/src/main/java/org/zwobble/couscous/values/IntegerValue.java b/src/main/java/org/zwobble/couscous/values/IntegerValue.java
index 86de00f..d657097 100644
--- a/src/main/java/org/zwobble/couscous/values/IntegerValue.java
+++ b/src/main/java/org/zwobble/couscous/values/IntegerValue.java
@@ -1,9 +1,9 @@
 package org.zwobble.couscous.values;
 
 import org.zwobble.couscous.types.ScalarType;
+import org.zwobble.couscous.types.Types;
 
 public final class IntegerValue implements PrimitiveValue {
-    public static final ScalarType REF = ScalarType.of("int");
     private final int value;
     
     @Override
@@ -13,7 +13,7 @@ public final class IntegerValue implements PrimitiveValue {
     
     @Override
     public ScalarType getType() {
-        return REF;
+        return Types.INT;
     }
     
     public IntegerValue(final int value) {
diff --git a/src/main/java/org/zwobble/couscous/values/ObjectValues.java b/src/main/java/org/zwobble/couscous/values/ObjectValues.java
deleted file mode 100644
index 1df2de6..0000000
--- a/src/main/java/org/zwobble/couscous/values/ObjectValues.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.zwobble.couscous.values;
-
-import org.zwobble.couscous.types.ScalarType;
-
-public class ObjectValues {
-    public static final ScalarType VOID = ScalarType.of("void");
-    public static final ScalarType CLASS = ScalarType.of("java.lang.Class");
-    public static final ScalarType OBJECT = ScalarType.of("java.lang.Object");
-    public static final ScalarType BOXED_INT = ScalarType.of("java.lang.Integer");
-    public static final ScalarType BOXED_BOOLEAN = ScalarType.of("java.lang.Boolean");
-}
diff --git a/src/main/java/org/zwobble/couscous/values/StringValue.java b/src/main/java/org/zwobble/couscous/values/StringValue.java
index 6a417f5..41bd5e9 100644
--- a/src/main/java/org/zwobble/couscous/values/StringValue.java
+++ b/src/main/java/org/zwobble/couscous/values/StringValue.java
@@ -1,13 +1,13 @@
 package org.zwobble.couscous.values;
 
 import org.zwobble.couscous.types.ScalarType;
+import org.zwobble.couscous.types.Types;
 
 public final class StringValue implements PrimitiveValue {
-    
     public static StringValue of(String value) {
         return new StringValue(value);
     }
-    public static final ScalarType REF = ScalarType.of("java.lang.String");
+
     private final String value;
     
     @Override
@@ -17,7 +17,7 @@ public final class StringValue implements PrimitiveValue {
     
     @Override
     public ScalarType getType() {
-        return REF;
+        return Types.STRING;
     }
     
     private StringValue(final String value) {
diff --git a/src/main/java/org/zwobble/couscous/values/TypeValue.java b/src/main/java/org/zwobble/couscous/values/TypeValue.java
index 4a3b13d..d5234ac 100644
--- a/src/main/java/org/zwobble/couscous/values/TypeValue.java
+++ b/src/main/java/org/zwobble/couscous/values/TypeValue.java
@@ -3,6 +3,7 @@ package org.zwobble.couscous.values;
 import org.zwobble.couscous.types.ParameterizedType;
 import org.zwobble.couscous.types.ScalarType;
 import org.zwobble.couscous.types.Type;
+import org.zwobble.couscous.types.Types;
 
 import static org.zwobble.couscous.util.ExtraLists.list;
 
@@ -24,7 +25,7 @@ public class TypeValue implements PrimitiveValue {
 
     @Override
     public Type getType() {
-        return new ParameterizedType(ObjectValues.CLASS, list(value));
+        return new ParameterizedType(Types.CLASS, list(value));
     }
 
     @Override
diff --git a/src/main/java/org/zwobble/couscous/values/UnitValue.java b/src/main/java/org/zwobble/couscous/values/UnitValue.java
index 3af8111..5b6698b 100644
--- a/src/main/java/org/zwobble/couscous/values/UnitValue.java
+++ b/src/main/java/org/zwobble/couscous/values/UnitValue.java
@@ -1,10 +1,9 @@
 package org.zwobble.couscous.values;
 
 import org.zwobble.couscous.types.ScalarType;
+import org.zwobble.couscous.types.Types;
 
 public class UnitValue implements PrimitiveValue {
-    public static final ScalarType REF = ScalarType.of("void");
-    
     static final UnitValue UNIT = new UnitValue();
     
     private UnitValue() {
@@ -17,6 +16,6 @@ public class UnitValue implements PrimitiveValue {
 
     @Override
     public ScalarType getType() {
-        return REF;
+        return Types.VOID;
     }
 }