Introduce Type interface

10 files changed, 30 insertions, 30 deletions

diff --git a/src/main/java/org/zwobble/couscous/values/BooleanValue.java b/src/main/java/org/zwobble/couscous/values/BooleanValue.java
index 887cddf..fd387e0 100644
--- a/src/main/java/org/zwobble/couscous/values/BooleanValue.java
+++ b/src/main/java/org/zwobble/couscous/values/BooleanValue.java
@@ -1,9 +1,9 @@
 package org.zwobble.couscous.values;
 
-import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public final class BooleanValue implements PrimitiveValue {
-    public static final TypeName REF = TypeName.of("boolean");
+    public static final ScalarType REF = ScalarType.of("boolean");
 
     private final boolean value;
 
@@ -21,7 +21,7 @@ public final class BooleanValue implements PrimitiveValue {
     }
     
     @Override
-    public TypeName getType() {
+    public ScalarType 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 ed0040a..22a233b 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.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public final class IntegerValue implements PrimitiveValue {
-    public static final TypeName REF = TypeName.of("int");
+    public static final ScalarType REF = ScalarType.of("int");
     private final int value;
     
     @Override
@@ -12,7 +12,7 @@ public final class IntegerValue implements PrimitiveValue {
     }
     
     @Override
-    public TypeName getType() {
+    public ScalarType getType() {
         return REF;
     }
     
diff --git a/src/main/java/org/zwobble/couscous/values/InternalCouscousValue.java b/src/main/java/org/zwobble/couscous/values/InternalCouscousValue.java
index c08104f..b56abec 100644
--- a/src/main/java/org/zwobble/couscous/values/InternalCouscousValue.java
+++ b/src/main/java/org/zwobble/couscous/values/InternalCouscousValue.java
@@ -1,7 +1,7 @@
 package org.zwobble.couscous.values;
 
-import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public class InternalCouscousValue {
-    public static final TypeName REF = TypeName.of("_couscous");
+    public static final ScalarType REF = ScalarType.of("_couscous");
 }
diff --git a/src/main/java/org/zwobble/couscous/values/ObjectValues.java b/src/main/java/org/zwobble/couscous/values/ObjectValues.java
index 2681259..5dd94a7 100644
--- a/src/main/java/org/zwobble/couscous/values/ObjectValues.java
+++ b/src/main/java/org/zwobble/couscous/values/ObjectValues.java
@@ -1,10 +1,10 @@
 package org.zwobble.couscous.values;
 
-import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public class ObjectValues {
-    public static final TypeName CLASS = TypeName.of("java.lang.Class");
-    public static final TypeName OBJECT = TypeName.of("java.lang.Object");
-    public static final TypeName BOXED_INT = TypeName.of("java.lang.Integer");
-    public static final TypeName BOXED_BOOLEAN = TypeName.of("java.lang.Boolean");
+    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/PrimitiveValue.java b/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
index aefff21..cd6a078 100644
--- a/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
+++ b/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
@@ -1,8 +1,8 @@
 package org.zwobble.couscous.values;
 
-import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public interface PrimitiveValue {
     <T> T accept(PrimitiveValueVisitor<T> visitor);
-    TypeName getType();
+    ScalarType getType();
 }
diff --git a/src/main/java/org/zwobble/couscous/values/PrimitiveValueVisitor.java b/src/main/java/org/zwobble/couscous/values/PrimitiveValueVisitor.java
index 18b6916..302118d 100644
--- a/src/main/java/org/zwobble/couscous/values/PrimitiveValueVisitor.java
+++ b/src/main/java/org/zwobble/couscous/values/PrimitiveValueVisitor.java
@@ -1,11 +1,11 @@
 package org.zwobble.couscous.values;
 
-import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public interface PrimitiveValueVisitor<T> {
     T visitInteger(int value);
     T visitString(String value);
     T visitBoolean(boolean value);
     T visitUnit();
-    T visitType(TypeName value);
+    T visitType(ScalarType value);
 }
diff --git a/src/main/java/org/zwobble/couscous/values/PrimitiveValues.java b/src/main/java/org/zwobble/couscous/values/PrimitiveValues.java
index 8022a9d..9aac702 100644
--- a/src/main/java/org/zwobble/couscous/values/PrimitiveValues.java
+++ b/src/main/java/org/zwobble/couscous/values/PrimitiveValues.java
@@ -1,6 +1,6 @@
 package org.zwobble.couscous.values;
 
-import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public class PrimitiveValues {
     public static final PrimitiveValue UNIT = UnitValue.UNIT;
@@ -19,7 +19,7 @@ public class PrimitiveValues {
         return value ? TRUE : FALSE;
     }
 
-    public static PrimitiveValue value(TypeName type) {
+    public static PrimitiveValue value(ScalarType type) {
         return new TypeValue(type);
     }
 }
diff --git a/src/main/java/org/zwobble/couscous/values/StringValue.java b/src/main/java/org/zwobble/couscous/values/StringValue.java
index d2a0a6a..4d45ae8 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.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public final class StringValue implements PrimitiveValue {
     
     public static StringValue of(String value) {
         return new StringValue(value);
     }
-    public static final TypeName REF = TypeName.of("java.lang.String");
+    public static final ScalarType REF = ScalarType.of("java.lang.String");
     private final String value;
     
     @Override
@@ -16,7 +16,7 @@ public final class StringValue implements PrimitiveValue {
     }
     
     @Override
-    public TypeName getType() {
+    public ScalarType getType() {
         return REF;
     }
     
diff --git a/src/main/java/org/zwobble/couscous/values/TypeValue.java b/src/main/java/org/zwobble/couscous/values/TypeValue.java
index 663673e..e7f5fe4 100644
--- a/src/main/java/org/zwobble/couscous/values/TypeValue.java
+++ b/src/main/java/org/zwobble/couscous/values/TypeValue.java
@@ -1,15 +1,15 @@
 package org.zwobble.couscous.values;
 
-import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public class TypeValue implements PrimitiveValue {
-    private final TypeName value;
+    private final ScalarType value;
 
-    public TypeValue(TypeName value) {
+    public TypeValue(ScalarType value) {
         this.value = value;
     }
 
-    public TypeName getValue() {
+    public ScalarType getValue() {
         return value;
     }
 
@@ -19,7 +19,7 @@ public class TypeValue implements PrimitiveValue {
     }
 
     @Override
-    public TypeName getType() {
+    public ScalarType getType() {
         return ObjectValues.CLASS;
     }
 
diff --git a/src/main/java/org/zwobble/couscous/values/UnitValue.java b/src/main/java/org/zwobble/couscous/values/UnitValue.java
index dfa11d4..398f04a 100644
--- a/src/main/java/org/zwobble/couscous/values/UnitValue.java
+++ b/src/main/java/org/zwobble/couscous/values/UnitValue.java
@@ -1,9 +1,9 @@
 package org.zwobble.couscous.values;
 
-import org.zwobble.couscous.ast.TypeName;
+import org.zwobble.couscous.ast.types.ScalarType;
 
 public class UnitValue implements PrimitiveValue {
-    public static final TypeName REF = TypeName.of("org.zwobble.couscous.runtime.Unit");
+    public static final ScalarType REF = ScalarType.of("org.zwobble.couscous.runtime.Unit");
     
     static final UnitValue UNIT = new UnitValue();
     
@@ -16,7 +16,7 @@ public class UnitValue implements PrimitiveValue {
     }
 
     @Override
-    public TypeName getType() {
+    public ScalarType getType() {
         return REF;
     }
 }