From 1520bcfed66005467ef6186cee174d4da2ead324 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 6 Oct 2015 17:11:08 +0100
Subject: Check constructor arguments

---
 .../org/zwobble/couscous/interpreter/values/ConcreteType.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/ConcreteType.java b/src/main/java/org/zwobble/couscous/interpreter/values/ConcreteType.java
index 2cc0921..6d0f3e5 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/ConcreteType.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/ConcreteType.java
@@ -169,6 +169,7 @@ public class ConcreteType {
             Environment environment,
             List<InterpreterValue> arguments) {
         val object = new ObjectInterpreterValue(this);
+        checkMethodArguments(constructor, arguments);
         constructor.apply(
             environment,
             MethodCallArguments.of(object, new PositionalArguments(arguments)));
@@ -180,6 +181,13 @@ public class ConcreteType {
             throw new NoSuchMethod(methodName);
         }
         val method = methods.get(methodName);
+        checkMethodArguments(method, arguments);
+        return method;
+    }
+
+    private static void checkMethodArguments(
+            final Callable method,
+            List<InterpreterValue> arguments) {
         if (method.getArgumentTypes().size() != arguments.size()) {
             throw new WrongNumberOfArguments(method.getArgumentTypes().size(), arguments.size());
         }
@@ -191,7 +199,6 @@ public class ConcreteType {
                 throw new UnexpectedValueType(formalArgumentType, actualArgumentType.getName());
             }
         }
-        return method;
     }
     
     @Override
-- 
cgit v1.2.3