Support method overloading in interpreter

2 files changed, 12 insertions, 24 deletions

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 a80934c..df97248 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
@@ -7,16 +7,7 @@ import org.junit.Test;
 import org.zwobble.couscous.ast.ClassNode;
 import org.zwobble.couscous.ast.ExpressionNode;
 import org.zwobble.couscous.ast.FormalArgumentNode;
-import org.zwobble.couscous.interpreter.ConditionMustBeBoolean;
-import org.zwobble.couscous.interpreter.Environment;
-import org.zwobble.couscous.interpreter.JavaProject;
-import org.zwobble.couscous.interpreter.MapBackedProject;
-import org.zwobble.couscous.interpreter.NoSuchField;
-import org.zwobble.couscous.interpreter.NoSuchMethod;
-import org.zwobble.couscous.interpreter.StackFrameBuilder;
-import org.zwobble.couscous.interpreter.UnboundField;
-import org.zwobble.couscous.interpreter.UnexpectedValueType;
-import org.zwobble.couscous.interpreter.WrongNumberOfArguments;
+import org.zwobble.couscous.interpreter.*;
 import org.zwobble.couscous.interpreter.values.IntegerInterpreterValue;
 import org.zwobble.couscous.interpreter.values.InterpreterValue;
 import org.zwobble.couscous.interpreter.values.StringInterpreterValue;
@@ -72,31 +63,33 @@ public class EvaluatorTests extends BackendEvalTests {
                     "size",
                     asList(),
                     IntegerValue.REF)));
-        assertEquals(new NoSuchMethod("size"), exception);
+        assertEquals(new MethodSignature("size", asList()), exception.getSignature());
     }
     
     @Test
     public void errorIfWrongNumberOfArgumentsArePassed() {
-        WrongNumberOfArguments exception = assertThrows(WrongNumberOfArguments.class,
+        NoSuchMethod exception = assertThrows(NoSuchMethod.class,
             () -> eval(emptyEnvironment(),
                 methodCall(
                     literal("hello"),
                     "substring",
                     asList(literal(1)),
                     StringValue.REF)));
-        assertEquals(new WrongNumberOfArguments(2, 1), exception);
+        assertEquals(new MethodSignature("substring", asList(IntegerValue.REF)), exception.getSignature());
     }
     
     @Test
     public void errorIfArgumentIsWrongType() {
-        UnexpectedValueType exception = assertThrows(UnexpectedValueType.class,
+        NoSuchMethod exception = assertThrows(NoSuchMethod.class,
             () -> eval(emptyEnvironment(),
                 methodCall(
                     literal("hello"),
                     "substring",
                     asList(literal(0), literal("")),
                     StringValue.REF)));
-        assertEquals(new UnexpectedValueType(IntegerValue.REF, StringValue.REF), exception);
+        assertEquals(
+            new MethodSignature("substring", asList(IntegerValue.REF, StringValue.REF)),
+            exception.getSignature());
     }
     
     @Test
diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
index 50188ce..2be59a8 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java
@@ -10,13 +10,7 @@ import org.zwobble.couscous.ast.LiteralNode;
 import org.zwobble.couscous.ast.LocalVariableDeclarationNode;
 import org.zwobble.couscous.ast.MethodNode;
 import org.zwobble.couscous.ast.TypeName;
-import org.zwobble.couscous.interpreter.Interpreter;
-import org.zwobble.couscous.interpreter.JavaProject;
-import org.zwobble.couscous.interpreter.Project;
-import org.zwobble.couscous.interpreter.UnboundVariable;
-import org.zwobble.couscous.interpreter.UnexpectedValueType;
-import org.zwobble.couscous.interpreter.VariableNotInScope;
-import org.zwobble.couscous.interpreter.WrongNumberOfArguments;
+import org.zwobble.couscous.interpreter.*;
 import org.zwobble.couscous.interpreter.values.InterpreterValue;
 import org.zwobble.couscous.interpreter.values.InterpreterValues;
 import org.zwobble.couscous.tests.BackendMethodTests;
@@ -25,6 +19,7 @@ import org.zwobble.couscous.values.IntegerValue;
 import org.zwobble.couscous.values.PrimitiveValue;
 import org.zwobble.couscous.values.StringValue;
 
+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.ExpressionStatementNode.expressionStatement;
@@ -44,10 +39,10 @@ public class InterpreterMethodTests extends BackendMethodTests {
     public void errorIfWrongNumberOfArgumentsArePassed() {
         MethodNode.Builder method = staticMethod("hello");
         
-        WrongNumberOfArguments exception = assertThrows(WrongNumberOfArguments.class,
+        NoSuchMethod exception = assertThrows(NoSuchMethod.class,
             () -> runMethod(method, value("hello, world!")));
         
-        assertEquals(new WrongNumberOfArguments(0, 1), exception);
+        assertEquals(new MethodSignature("hello", asList(StringValue.REF)), exception.getSignature());
     }
     
     @Test