From a467e016fb02acb3e6bdb38eefc72e77499e9c74 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 6 Oct 2015 17:31:52 +0100
Subject: Put type checking in one place

---
 .../zwobble/couscous/interpreter/values/ObjectInterpreterValue.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(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 f0ecbd1..6e653d2 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/ObjectInterpreterValue.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/ObjectInterpreterValue.java
@@ -4,8 +4,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
+import org.zwobble.couscous.interpreter.InterpreterTypes;
 import org.zwobble.couscous.interpreter.NoSuchField;
-import org.zwobble.couscous.interpreter.UnexpectedValueType;
 import org.zwobble.couscous.values.PrimitiveValue;
 
 import lombok.val;
@@ -40,9 +40,7 @@ public class ObjectInterpreterValue implements InterpreterValue {
 
     public void setField(String fieldName, InterpreterValue value) {
         val field = type.getField(fieldName).orElseThrow(() -> new NoSuchField(fieldName));
-        if (!field.getType().equals(value.getType().getName())) {
-            throw new UnexpectedValueType(field.getType(), value.getType().getName());
-        }
+        InterpreterTypes.checkIsInstance(field.getType(), value);
         fields.put(fieldName, value);   
     }
 }
-- 
cgit v1.2.3