From c0f18f14d6dd7d8f8ec890fe6d8fd67c4fba7ea3 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 31 Mar 2016 21:20:37 +0100 Subject: Rename PositionalArguments to Arguments, don't implement Iterable --- .../values/BoxedIntegerInterpreterValue.java | 2 +- .../interpreter/values/IntegerInterpreterValue.java | 2 +- .../interpreter/values/MethodCallArguments.java | 18 +++++++++--------- .../couscous/interpreter/values/StaticMethodValue.java | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/values') 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 { 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 MethodCallArguments of(final T receiver, final PositionalArguments positionalArguments) { - return new MethodCallArguments(receiver, positionalArguments); + public static MethodCallArguments of(final T receiver, final Arguments arguments) { + return new MethodCallArguments(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 argumentTypes; - private final BiFunction apply; + private final BiFunction apply; - public InterpreterValue apply(Environment environment, PositionalArguments arguments) { + public InterpreterValue apply(Environment environment, Arguments arguments) { return apply.apply(environment, arguments); } - public StaticMethodValue(final List argumentTypes, final BiFunction apply) { + public StaticMethodValue(final List argumentTypes, final BiFunction apply) { this.argumentTypes = argumentTypes; this.apply = apply; } -- cgit v1.2.3