Split interpreter values from primitives

1 files changed, 34 insertions, 3 deletions

diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java
index ec2d97f..37a0669 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/InterpreterValues.java
@@ -1,13 +1,44 @@
 package org.zwobble.couscous.interpreter.values;
 
+import org.zwobble.couscous.values.BooleanValue;
+import org.zwobble.couscous.values.IntegerValue;
+import org.zwobble.couscous.values.PrimitiveValue;
+import org.zwobble.couscous.values.PrimitiveValueVisitor;
+import org.zwobble.couscous.values.StringValue;
+import org.zwobble.couscous.values.UnitValue;
+
 public class InterpreterValues {
-    public static final UnitValue UNIT = UnitValue.UNIT;
+    public static final UnitInterpreterValue UNIT = UnitInterpreterValue.UNIT;
     
     public static InterpreterValue value(int value) {
-        return new IntegerValue(value);
+        return new IntegerInterpreterValue(value);
     }
     
     public static InterpreterValue value(String value) {
-        return new StringValue(value);
+        return new StringInterpreterValue(value);
+    }
+
+    public static InterpreterValue value(PrimitiveValue value) {
+        return value.accept(new PrimitiveValueVisitor<InterpreterValue>() {
+            @Override
+            public InterpreterValue visit(IntegerValue value) {
+                return new IntegerInterpreterValue(value.getValue());
+            }
+
+            @Override
+            public InterpreterValue visit(StringValue value) {
+                return new StringInterpreterValue(value.getValue());
+            }
+
+            @Override
+            public InterpreterValue visit(BooleanValue value) {
+                return new BooleanInterpreterValue(value.getValue());
+            }
+
+            @Override
+            public InterpreterValue visit(UnitValue unitValue) {
+                return UNIT;
+            }
+        });
     }
 }