From c1de40d3615a8efc852fd1a12832437ee3ce4318 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 30 Sep 2015 19:47:38 +0100
Subject: Define methods once per type

---
 .../zwobble/couscous/interpreter/Arguments.java    | 29 ++++++++++++++++++++++
 .../zwobble/couscous/interpreter/Evaluator.java    |  5 ++--
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/zwobble/couscous/interpreter/Arguments.java

(limited to 'src/main/java/org/zwobble/couscous/interpreter')

diff --git a/src/main/java/org/zwobble/couscous/interpreter/Arguments.java b/src/main/java/org/zwobble/couscous/interpreter/Arguments.java
new file mode 100644
index 0000000..d08393d
--- /dev/null
+++ b/src/main/java/org/zwobble/couscous/interpreter/Arguments.java
@@ -0,0 +1,29 @@
+package org.zwobble.couscous.interpreter;
+
+import java.util.List;
+
+import org.zwobble.couscous.values.InterpreterValue;
+
+import lombok.val;
+
+public class Arguments {
+    private int index = 0;
+    private List<InterpreterValue> values;
+    
+    public Arguments(List<InterpreterValue> values) {
+        this.values = values;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends InterpreterValue> T pop(Class<T> valueType) {
+        val value = values.get(index);
+        index++;
+        if (valueType.isInstance(value)) {
+            return (T) value;            
+        } else {
+            // TODO: throw a more specific error
+            throw new UnsupportedOperationException();
+        }
+        
+    }
+}
diff --git a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java
index 7aba54b..6a566c9 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java
@@ -61,12 +61,11 @@ public class Evaluator implements ExpressionNodeVisitor<InterpreterValue> {
     @Override
     public InterpreterValue visit(MethodCallNode methodCall) {
         val receiver = eval(methodCall.getReceiver());
+        val type = receiver.getType();
         val arguments = methodCall.getArguments()
             .stream()
             .map(argument -> eval(argument))
             .collect(Collectors.toList());
-        val method = receiver.getMethod(methodCall.getMethodName())
-            .orElseThrow(() -> new NoSuchMethod(methodCall.getMethodName()));
-        return method.call(arguments);
+        return type.callMethod(receiver, methodCall.getMethodName(), arguments);
     }
 }
-- 
cgit v1.2.3