From cc1543421aafac336be05ac0b75cecc2da4b6818 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 5 Oct 2015 12:55:11 +0100 Subject: Split interpreter values from primitives --- src/main/java/org/zwobble/couscous/ast/LiteralNode.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/ast/LiteralNode.java') diff --git a/src/main/java/org/zwobble/couscous/ast/LiteralNode.java b/src/main/java/org/zwobble/couscous/ast/LiteralNode.java index 6bc498a..05a599c 100644 --- a/src/main/java/org/zwobble/couscous/ast/LiteralNode.java +++ b/src/main/java/org/zwobble/couscous/ast/LiteralNode.java @@ -1,32 +1,31 @@ package org.zwobble.couscous.ast; import org.zwobble.couscous.ast.visitors.ExpressionNodeVisitor; -import org.zwobble.couscous.interpreter.values.BooleanValue; -import org.zwobble.couscous.interpreter.values.IntegerValue; -import org.zwobble.couscous.interpreter.values.InterpreterValue; -import org.zwobble.couscous.interpreter.values.StringValue; +import org.zwobble.couscous.values.PrimitiveValue; + +import static org.zwobble.couscous.values.PrimitiveValues.value; import lombok.Value; @Value public class LiteralNode implements ExpressionNode { - public static LiteralNode literal(InterpreterValue value) { + public static LiteralNode literal(PrimitiveValue value) { return new LiteralNode(value); } public static LiteralNode literal(String value) { - return new LiteralNode(new StringValue(value)); + return new LiteralNode(value(value)); } public static LiteralNode literal(int value) { - return new LiteralNode(new IntegerValue(value)); + return new LiteralNode(value(value)); } public static LiteralNode literal(boolean value) { - return new LiteralNode(new BooleanValue(value)); + return new LiteralNode(value(value)); } - InterpreterValue value; + PrimitiveValue value; @Override public T accept(ExpressionNodeVisitor visitor) { -- cgit v1.2.3