Remove duplication of primitive types

2 files changed, 8 insertions, 3 deletions

diff --git a/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java b/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
index 0075a30..2fb4137 100644
--- a/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
+++ b/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
@@ -1,10 +1,11 @@
 package org.zwobble.couscous.values;
 
 import org.zwobble.couscous.types.ScalarType;
+import org.zwobble.couscous.types.Type;
 
 public interface PrimitiveValue {
     <T> T accept(Visitor<T> visitor);
-    ScalarType getType();
+    Type getType();
 
     interface Visitor<T> {
         T visitInteger(int value);
diff --git a/src/main/java/org/zwobble/couscous/values/TypeValue.java b/src/main/java/org/zwobble/couscous/values/TypeValue.java
index cc8b026..4a3b13d 100644
--- a/src/main/java/org/zwobble/couscous/values/TypeValue.java
+++ b/src/main/java/org/zwobble/couscous/values/TypeValue.java
@@ -1,6 +1,10 @@
 package org.zwobble.couscous.values;
 
+import org.zwobble.couscous.types.ParameterizedType;
 import org.zwobble.couscous.types.ScalarType;
+import org.zwobble.couscous.types.Type;
+
+import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class TypeValue implements PrimitiveValue {
     private final ScalarType value;
@@ -19,8 +23,8 @@ public class TypeValue implements PrimitiveValue {
     }
 
     @Override
-    public ScalarType getType() {
-        return ObjectValues.CLASS;
+    public Type getType() {
+        return new ParameterizedType(ObjectValues.CLASS, list(value));
     }
 
     @Override