Rename PositionalArguments to Arguments, don't implement Iterable

4 files changed, 15 insertions, 15 deletions

diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/BoxedIntegerInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/BoxedIntegerInterpreterValue.java
index b4f8701..5e419aa 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/BoxedIntegerInterpreterValue.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/BoxedIntegerInterpreterValue.java
@@ -34,7 +34,7 @@ public class BoxedIntegerInterpreterValue {
 
         .method("equals", list(Types.OBJECT), Types.BOOLEAN,
             (environment, arguments) -> {
-                InterpreterValue right = arguments.getPositionalArguments().get(0);
+                InterpreterValue right = arguments.getArguments().get(0);
                 if (right.getType().getType().equals(Types.BOXED_INT)) {
                     IntegerInterpreterValue leftValue = (IntegerInterpreterValue)arguments.getReceiver().getField("value");
                     IntegerInterpreterValue rightValue = (IntegerInterpreterValue)right.getField("value");
diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java
index 00d4aa5..7e0c7c8 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java
@@ -28,7 +28,7 @@ public final class IntegerInterpreterValue implements InterpreterValue {
             infixReturningInteger((left, right) -> left % right))
         .method(Operator.EQUALS.getSymbol(), list(Types.INT), Types.BOOLEAN,
             (environment, arguments) -> {
-                IntegerInterpreterValue right = (IntegerInterpreterValue)arguments.getPositionalArguments().get(0);
+                IntegerInterpreterValue right = (IntegerInterpreterValue)arguments.getArguments().get(0);
                 return integerEquals(arguments, right);
             })
         .method(Operator.NOT_EQUALS.getSymbol(), list(Types.INT), Types.BOOLEAN,
diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/MethodCallArguments.java b/src/main/java/org/zwobble/couscous/interpreter/values/MethodCallArguments.java
index 23af57f..7c18745 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/MethodCallArguments.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/MethodCallArguments.java
@@ -1,29 +1,29 @@
 package org.zwobble.couscous.interpreter.values;
 
-import org.zwobble.couscous.interpreter.PositionalArguments;
+import org.zwobble.couscous.interpreter.Arguments;
 
 public class MethodCallArguments<T> {
     private final T receiver;
-    private final PositionalArguments positionalArguments;
+    private final Arguments arguments;
     
     public InterpreterValue get(int index) {
-        return positionalArguments.get(index);
+        return arguments.get(index);
     }
     
-    private MethodCallArguments(final T receiver, final PositionalArguments positionalArguments) {
+    private MethodCallArguments(final T receiver, final Arguments arguments) {
         this.receiver = receiver;
-        this.positionalArguments = positionalArguments;
+        this.arguments = arguments;
     }
     
-    public static <T> MethodCallArguments<T> of(final T receiver, final PositionalArguments positionalArguments) {
-        return new MethodCallArguments<T>(receiver, positionalArguments);
+    public static <T> MethodCallArguments<T> of(final T receiver, final Arguments arguments) {
+        return new MethodCallArguments<T>(receiver, arguments);
     }
     
     public T getReceiver() {
         return this.receiver;
     }
     
-    public PositionalArguments getPositionalArguments() {
-        return this.positionalArguments;
+    public Arguments getArguments() {
+        return this.arguments;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/zwobble/couscous/interpreter/values/StaticMethodValue.java b/src/main/java/org/zwobble/couscous/interpreter/values/StaticMethodValue.java
index c035070..88dd89f 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/values/StaticMethodValue.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/values/StaticMethodValue.java
@@ -2,20 +2,20 @@ package org.zwobble.couscous.interpreter.values;
 
 import org.zwobble.couscous.types.Type;
 import org.zwobble.couscous.interpreter.Environment;
-import org.zwobble.couscous.interpreter.PositionalArguments;
+import org.zwobble.couscous.interpreter.Arguments;
 
 import java.util.List;
 import java.util.function.BiFunction;
 
 public final class StaticMethodValue implements Callable {
     private final List<Type> argumentTypes;
-    private final BiFunction<Environment, PositionalArguments, InterpreterValue> apply;
+    private final BiFunction<Environment, Arguments, InterpreterValue> apply;
     
-    public InterpreterValue apply(Environment environment, PositionalArguments arguments) {
+    public InterpreterValue apply(Environment environment, Arguments arguments) {
         return apply.apply(environment, arguments);
     }
     
-    public StaticMethodValue(final List<Type> argumentTypes, final BiFunction<Environment, PositionalArguments, InterpreterValue> apply) {
+    public StaticMethodValue(final List<Type> argumentTypes, final BiFunction<Environment, Arguments, InterpreterValue> apply) {
         this.argumentTypes = argumentTypes;
         this.apply = apply;
     }