From c0f18f14d6dd7d8f8ec890fe6d8fd67c4fba7ea3 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Thu, 31 Mar 2016 21:20:37 +0100
Subject: Rename PositionalArguments to Arguments, don't implement Iterable

---
 src/main/java/org/zwobble/couscous/interpreter/Executor.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/org/zwobble/couscous/interpreter/Executor.java b/src/main/java/org/zwobble/couscous/interpreter/Executor.java
index 75ace0a..f6c1c3a 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/Executor.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/Executor.java
@@ -20,7 +20,7 @@ public class Executor implements StatementNodeMapper<Optional<InterpreterValue>>
         Environment environment,
         MethodNode method,
         Optional<InterpreterValue> thisValue,
-        PositionalArguments actualArguments)
+        Arguments actualArguments)
     {
         List<StatementNode> body = method.getBody().orElseThrow(() -> new RuntimeException("Cannot call abstract method"));
         return callMethod(environment, method.getArguments(), body, thisValue, actualArguments);
@@ -30,7 +30,7 @@ public class Executor implements StatementNodeMapper<Optional<InterpreterValue>>
         Environment environment,
         ConstructorNode constructor,
         InterpreterValue thisValue,
-        PositionalArguments actualArguments)
+        Arguments actualArguments)
     {
         return callMethod(environment, constructor.getArguments(), constructor.getBody(), Optional.of(thisValue), actualArguments);
     }
@@ -40,7 +40,7 @@ public class Executor implements StatementNodeMapper<Optional<InterpreterValue>>
         List<FormalArgumentNode> formalArguments,
         List<StatementNode> statements,
         Optional<InterpreterValue> thisValue,
-        PositionalArguments actualArguments)
+        Arguments actualArguments)
     {
         Environment innerEnvironment = buildEnvironment(environment, formalArguments, statements, thisValue, actualArguments);
         return exec(innerEnvironment, statements)
@@ -52,10 +52,10 @@ public class Executor implements StatementNodeMapper<Optional<InterpreterValue>>
         List<FormalArgumentNode> formalArguments,
         List<StatementNode> statements,
         Optional<InterpreterValue> thisValue,
-        PositionalArguments arguments)
+        Arguments arguments)
     {
         StackFrameBuilder stackFrame = new StackFrameBuilder();
-        forEach(formalArguments, arguments, stackFrame::declare);
+        forEach(formalArguments, arguments.getValues(), stackFrame::declare);
         findDeclarations(statements).forEach(declaration -> stackFrame.declare(declaration));
         return environment.withStackFrame(thisValue, stackFrame.build());
     }
-- 
cgit v1.2.3