From d5a76fddca54379b943d988cdca4098ed4cbbad3 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 29 Sep 2015 20:48:16 +0100 Subject: Check that condition is a boolean --- src/main/java/org/zwobble/couscous/interpreter/Evaluator.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 6586f6a..232441c 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java @@ -45,8 +45,11 @@ public class Evaluator implements ExpressionNodeVisitor { @Override public InterpreterValue visit(TernaryConditionalNode ternaryConditional) { - val condition = (BooleanValue)eval(ternaryConditional.getCondition()); - val branch = condition.getValue() + val condition = eval(ternaryConditional.getCondition()); + if (!(condition instanceof BooleanValue)) { + throw new ConditionMustBeBoolean(condition); + } + val branch = ((BooleanValue)condition).getValue() ? ternaryConditional.getIfTrue() : ternaryConditional.getIfFalse(); return eval(branch); -- cgit v1.2.3