Combine type reference and class name into type name

6 files changed, 16 insertions, 20 deletions

diff --git a/src/main/java/org/zwobble/couscous/values/BooleanValue.java b/src/main/java/org/zwobble/couscous/values/BooleanValue.java
index 76f828e..e733e44 100644
--- a/src/main/java/org/zwobble/couscous/values/BooleanValue.java
+++ b/src/main/java/org/zwobble/couscous/values/BooleanValue.java
@@ -1,6 +1,6 @@
 package org.zwobble.couscous.values;
 
-import static org.zwobble.couscous.values.TypeReference.typeRef;
+import org.zwobble.couscous.ast.TypeName;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -8,7 +8,7 @@ import lombok.Value;
 
 @Value
 public class BooleanValue implements PrimitiveValue {
-    public static final TypeReference REF = typeRef("java.lang.Boolean");
+    public static final TypeName REF = TypeName.of("java.lang.Boolean");
     
     @Getter(value = AccessLevel.NONE)
     boolean value;
@@ -23,7 +23,7 @@ public class BooleanValue implements PrimitiveValue {
     }
 
     @Override
-    public TypeReference getType() {
+    public TypeName getType() {
         return REF;
     }
 }
diff --git a/src/main/java/org/zwobble/couscous/values/IntegerValue.java b/src/main/java/org/zwobble/couscous/values/IntegerValue.java
index 5c272a0..e65408a 100644
--- a/src/main/java/org/zwobble/couscous/values/IntegerValue.java
+++ b/src/main/java/org/zwobble/couscous/values/IntegerValue.java
@@ -1,12 +1,12 @@
 package org.zwobble.couscous.values;
 
-import static org.zwobble.couscous.values.TypeReference.typeRef;
+import org.zwobble.couscous.ast.TypeName;
 
 import lombok.Value;
 
 @Value
 public class IntegerValue implements PrimitiveValue {
-    public static final TypeReference REF = typeRef("java.lang.Integer");
+    public static final TypeName REF = TypeName.of("java.lang.Integer");
     
     int value;
 
@@ -16,7 +16,7 @@ public class IntegerValue implements PrimitiveValue {
     }
 
     @Override
-    public TypeReference getType() {
+    public TypeName getType() {
         return REF;
     }
 }
diff --git a/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java b/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
index 56da066..aefff21 100644
--- a/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
+++ b/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
@@ -1,6 +1,8 @@
 package org.zwobble.couscous.values;
 
+import org.zwobble.couscous.ast.TypeName;
+
 public interface PrimitiveValue {
     <T> T accept(PrimitiveValueVisitor<T> visitor);
-    TypeReference getType();
+    TypeName getType();
 }
diff --git a/src/main/java/org/zwobble/couscous/values/StringValue.java b/src/main/java/org/zwobble/couscous/values/StringValue.java
index ba0b1b5..bd95eb8 100644
--- a/src/main/java/org/zwobble/couscous/values/StringValue.java
+++ b/src/main/java/org/zwobble/couscous/values/StringValue.java
@@ -1,12 +1,12 @@
 package org.zwobble.couscous.values;
 
-import static org.zwobble.couscous.values.TypeReference.typeRef;
+import org.zwobble.couscous.ast.TypeName;
 
 import lombok.Value;
 
 @Value
 public class StringValue implements PrimitiveValue {
-    public static final TypeReference REF = typeRef("java.lang.String");
+    public static final TypeName REF = TypeName.of("java.lang.String");
 
     String value;
 
@@ -16,7 +16,7 @@ public class StringValue implements PrimitiveValue {
     }
 
     @Override
-    public TypeReference getType() {
+    public TypeName getType() {
         return REF;
     }
 }
diff --git a/src/main/java/org/zwobble/couscous/values/TypeReference.java b/src/main/java/org/zwobble/couscous/values/TypeReference.java
deleted file mode 100644
index 9eb4783..0000000
--- a/src/main/java/org/zwobble/couscous/values/TypeReference.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.zwobble.couscous.values;
-
-import lombok.Value;
-
-@Value(staticConstructor="typeRef")
-public class TypeReference {
-    String name;
-}
diff --git a/src/main/java/org/zwobble/couscous/values/UnitValue.java b/src/main/java/org/zwobble/couscous/values/UnitValue.java
index b4f6974..9d48b9e 100644
--- a/src/main/java/org/zwobble/couscous/values/UnitValue.java
+++ b/src/main/java/org/zwobble/couscous/values/UnitValue.java
@@ -1,7 +1,9 @@
 package org.zwobble.couscous.values;
 
+import org.zwobble.couscous.ast.TypeName;
+
 public class UnitValue implements PrimitiveValue {
-    public static final TypeReference REF = TypeReference.typeRef("org.zwobble.couscous.runtime.Unit");
+    public static final TypeName REF = TypeName.of("org.zwobble.couscous.runtime.Unit");
     
     static final UnitValue UNIT = new UnitValue();
     
@@ -14,7 +16,7 @@ public class UnitValue implements PrimitiveValue {
     }
 
     @Override
-    public TypeReference getType() {
+    public TypeName getType() {
         return REF;
     }
 }