Move PrimitiveValueVisitor into PrimitiveValue

7 files changed, 14 insertions, 17 deletions

diff --git a/src/main/java/org/zwobble/couscous/values/BooleanValue.java b/src/main/java/org/zwobble/couscous/values/BooleanValue.java
index fd387e0..b99bd14 100644
--- a/src/main/java/org/zwobble/couscous/values/BooleanValue.java
+++ b/src/main/java/org/zwobble/couscous/values/BooleanValue.java
@@ -16,7 +16,7 @@ public final class BooleanValue implements PrimitiveValue {
     }
     
     @Override
-    public <T> T accept(PrimitiveValueVisitor<T> visitor) {
+    public <T> T accept(Visitor<T> visitor) {
         return visitor.visitBoolean(value);
     }
     
diff --git a/src/main/java/org/zwobble/couscous/values/IntegerValue.java b/src/main/java/org/zwobble/couscous/values/IntegerValue.java
index 22a233b..8e04345 100644
--- a/src/main/java/org/zwobble/couscous/values/IntegerValue.java
+++ b/src/main/java/org/zwobble/couscous/values/IntegerValue.java
@@ -7,7 +7,7 @@ public final class IntegerValue implements PrimitiveValue {
     private final int value;
     
     @Override
-    public <T> T accept(PrimitiveValueVisitor<T> visitor) {
+    public <T> T accept(Visitor<T> visitor) {
         return visitor.visitInteger(value);
     }
     
diff --git a/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java b/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
index cd6a078..86d32de 100644
--- a/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
+++ b/src/main/java/org/zwobble/couscous/values/PrimitiveValue.java
@@ -3,6 +3,14 @@ package org.zwobble.couscous.values;
 import org.zwobble.couscous.ast.types.ScalarType;
 
 public interface PrimitiveValue {
-    <T> T accept(PrimitiveValueVisitor<T> visitor);
+    <T> T accept(Visitor<T> visitor);
     ScalarType getType();
+
+    interface Visitor<T> {
+        T visitInteger(int value);
+        T visitString(String value);
+        T visitBoolean(boolean value);
+        T visitUnit();
+        T visitType(ScalarType value);
+    }
 }
diff --git a/src/main/java/org/zwobble/couscous/values/PrimitiveValueVisitor.java b/src/main/java/org/zwobble/couscous/values/PrimitiveValueVisitor.java
deleted file mode 100644
index 302118d..0000000
--- a/src/main/java/org/zwobble/couscous/values/PrimitiveValueVisitor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.zwobble.couscous.values;
-
-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(ScalarType value);
-}
diff --git a/src/main/java/org/zwobble/couscous/values/StringValue.java b/src/main/java/org/zwobble/couscous/values/StringValue.java
index 4d45ae8..4e7a5f0 100644
--- a/src/main/java/org/zwobble/couscous/values/StringValue.java
+++ b/src/main/java/org/zwobble/couscous/values/StringValue.java
@@ -11,7 +11,7 @@ public final class StringValue implements PrimitiveValue {
     private final String value;
     
     @Override
-    public <T> T accept(PrimitiveValueVisitor<T> visitor) {
+    public <T> T accept(Visitor<T> visitor) {
         return visitor.visitString(value);
     }
     
diff --git a/src/main/java/org/zwobble/couscous/values/TypeValue.java b/src/main/java/org/zwobble/couscous/values/TypeValue.java
index e7f5fe4..2bb7c1f 100644
--- a/src/main/java/org/zwobble/couscous/values/TypeValue.java
+++ b/src/main/java/org/zwobble/couscous/values/TypeValue.java
@@ -14,7 +14,7 @@ public class TypeValue implements PrimitiveValue {
     }
 
     @Override
-    public <T> T accept(PrimitiveValueVisitor<T> visitor) {
+    public <T> T accept(Visitor<T> visitor) {
         return visitor.visitType(value);
     }
 
diff --git a/src/main/java/org/zwobble/couscous/values/UnitValue.java b/src/main/java/org/zwobble/couscous/values/UnitValue.java
index 241917b..d8a508f 100644
--- a/src/main/java/org/zwobble/couscous/values/UnitValue.java
+++ b/src/main/java/org/zwobble/couscous/values/UnitValue.java
@@ -11,7 +11,7 @@ public class UnitValue implements PrimitiveValue {
     }
     
     @Override
-    public <T> T accept(PrimitiveValueVisitor<T> visitor) {
+    public <T> T accept(Visitor<T> visitor) {
         return visitor.visitUnit();
     }