2 files changed, 27 insertions, 1 deletions
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
diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
index 9cf87a4..2cec753 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
@@ -27,6 +27,7 @@ import com.google.common.collect.ImmutableMap;
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.zwobble.couscous.ast.AssignmentNode.assign;
+import static org.zwobble.couscous.ast.ConstructorCallNode.constructorCall;
 import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg;
 import static org.zwobble.couscous.ast.LiteralNode.literal;
 import static org.zwobble.couscous.ast.MethodCallNode.methodCall;
@@ -93,6 +94,24 @@ public class EvaluatorTests extends BackendEvalTests {
         assertEquals(new UnexpectedValueType(IntegerValue.REF, StringValue.REF), exception);
     }
     
+    @Test
+    public void errorIfConstructorArgumentIsWrongType() {
+        val argument = formalArg(var(42, "x", IntegerValue.REF));
+        val classNode = ClassNode.builder("com.example.Example")
+            .constructor(constructor -> constructor
+                .argument(argument))
+            .build();
+        
+        val exception = assertThrows(UnexpectedValueType.class,
+            () -> evalExpression(
+                asList(classNode),
+                constructorCall(
+                    classNode.getName(),
+                    asList(literal("")))));
+        
+        assertEquals(new UnexpectedValueType(IntegerValue.REF, StringValue.REF), exception);
+    }
+    
     private static Environment emptyEnvironment() {
         return new Environment(
             JavaProject.builder().build(),