From 6bb8fe3f983cd0a2be76239df2124af633f0e05c Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 31 Mar 2016 12:08:02 +0100 Subject: Add evaluation of arrays to interpreter --- src/main/java/org/zwobble/couscous/interpreter/Evaluator.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/Evaluator.java') diff --git a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java index 1082ed1..8c3d355 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java @@ -1,18 +1,19 @@ package org.zwobble.couscous.interpreter; import org.zwobble.couscous.ast.*; -import org.zwobble.couscous.types.ScalarType; import org.zwobble.couscous.ast.visitors.AssignableExpressionNodeVisitor; import org.zwobble.couscous.ast.visitors.ExpressionNodeMapper; import org.zwobble.couscous.interpreter.errors.ConditionMustBeBoolean; import org.zwobble.couscous.interpreter.errors.InvalidCast; import org.zwobble.couscous.interpreter.values.*; +import org.zwobble.couscous.types.ScalarType; import org.zwobble.couscous.types.Types; import java.util.List; import java.util.stream.Collectors; import static org.zwobble.couscous.types.Types.erasure; +import static org.zwobble.couscous.util.ExtraLists.eagerMap; public class Evaluator implements ExpressionNodeMapper { public static InterpreterValue eval(Environment environment, ExpressionNode expression) { @@ -52,8 +53,10 @@ public class Evaluator implements ExpressionNodeMapper { } @Override - public InterpreterValue visit(ArrayNode arrayNode) { - throw new UnsupportedOperationException(); + public InterpreterValue visit(ArrayNode array) { + return new ArrayInterpreterValue( + array.getElementType(), + eagerMap(array.getElements(), this::eval)); } @Override -- cgit v1.2.3