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/interpreter/Interpreter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/Interpreter.java') diff --git a/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java b/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java index 39191ce..0c36d91 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Interpreter.java @@ -5,11 +5,11 @@ import java.util.stream.Collectors; import org.zwobble.couscous.Project; import org.zwobble.couscous.ast.ExpressionNode; -import org.zwobble.couscous.ast.LiteralNode; import org.zwobble.couscous.interpreter.values.InterpreterValue; import com.google.common.collect.ImmutableMap; +import static org.zwobble.couscous.ast.LiteralNode.literal; import static org.zwobble.couscous.ast.StaticMethodCallNode.staticMethodCall; import static org.zwobble.couscous.interpreter.Evaluator.eval; @@ -25,7 +25,7 @@ public class Interpreter { public InterpreterValue run(String className, String methodName, List arguments) { val argumentExpressions = arguments .stream() - .map(LiteralNode::literal) + .map(argument -> literal(argument.toPrimitiveValue().get())) .collect(Collectors.toList()); return eval(new Environment(project, ImmutableMap.of()), staticMethodCall(className, methodName, argumentExpressions)); -- cgit v1.2.3