From df43ad49026543712029ca1a7155b4bd764fdcf2 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 15 Nov 2015 15:35:38 +0000 Subject: Tidy up code --- .../couscous/interpreter/values/IntegerInterpreterValue.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java') 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 bbcf9c0..b050442 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java +++ b/src/main/java/org/zwobble/couscous/interpreter/values/IntegerInterpreterValue.java @@ -25,9 +25,9 @@ public final class IntegerInterpreterValue implements InterpreterValue { .method(Operator.MOD.getMethodName(), asList(IntegerValue.REF), infixReturningInteger((left, right) -> left % right)) .method(Operator.EQUALS.getMethodName(), asList(IntegerValue.REF), - infixReturningBoolean((left, right) -> left == right)) + infixReturningBoolean(Integer::equals)) .method(Operator.NOT_EQUALS.getMethodName(), asList(IntegerValue.REF), - infixReturningBoolean((left, right) -> left != right)) + infixReturningBoolean((left, right) -> !left.equals(right))) .method(Operator.GREATER_THAN.getMethodName(), asList(IntegerValue.REF), infixReturningBoolean((left, right) -> left > right)) .method(Operator.GREATER_THAN_OR_EQUAL.getMethodName(), asList(IntegerValue.REF), @@ -41,17 +41,13 @@ public final class IntegerInterpreterValue implements InterpreterValue { private static BiFunction, InterpreterValue> infixReturningInteger(BiFunction func) { - return infix((left, right) -> { - return new IntegerInterpreterValue(func.apply(left, right)); - }); + return infix((left, right) -> new IntegerInterpreterValue(func.apply(left, right))); } private static BiFunction, InterpreterValue> infixReturningBoolean(BiFunction func) { - return infix((left, right) -> { - return new BooleanInterpreterValue(func.apply(left, right)); - }); + return infix((left, right) -> new BooleanInterpreterValue(func.apply(left, right))); } private static -- cgit v1.2.3