From cf3b2cfd72f61fa3e4fdb13ebcfb70927c052599 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 6 Oct 2015 17:26:33 +0100 Subject: Ensure field is set to correct value --- .../couscous/interpreter/values/ObjectInterpreterValue.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/values/ObjectInterpreterValue.java') diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/ObjectInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/ObjectInterpreterValue.java index 7ff8bb1..f0ecbd1 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/values/ObjectInterpreterValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/ObjectInterpreterValue.java @@ -5,8 +5,11 @@ import java.util.Map; import java.util.Optional; import org.zwobble.couscous.interpreter.NoSuchField; +import org.zwobble.couscous.interpreter.UnexpectedValueType; import org.zwobble.couscous.values.PrimitiveValue; +import lombok.val; + public class ObjectInterpreterValue implements InterpreterValue { private final ConcreteType type; private final Map fields; @@ -36,7 +39,10 @@ public class ObjectInterpreterValue implements InterpreterValue { } public void setField(String fieldName, InterpreterValue value) { - type.getField(fieldName).orElseThrow(() -> new NoSuchField(fieldName)); + val field = type.getField(fieldName).orElseThrow(() -> new NoSuchField(fieldName)); + if (!field.getType().equals(value.getType().getName())) { + throw new UnexpectedValueType(field.getType(), value.getType().getName()); + } fields.put(fieldName, value); } } -- cgit v1.2.3