From ae0ec0c375177f05300956beda201a7bb252592a Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Tue, 29 Aug 2017 18:31:47 -0700 Subject: [PATCH] Switch add and multiply to two parameters. --- .../org/nwapw/abacus/plugin/StandardPlugin.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java b/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java index 3ba9d76..16bbba1 100755 --- a/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java +++ b/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java @@ -21,16 +21,12 @@ public class StandardPlugin extends Plugin { public static final NumberOperator OP_ADD = new NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) { @Override public boolean matchesParams(NumberInterface[] params) { - return params.length >= 1; + return params.length == 2; } @Override public NumberInterface applyInternal(NumberInterface[] params) { - NumberInterface sum = params[0]; - for (int i = 1; i < params.length; i++) { - sum = sum.add(params[i]); - } - return sum; + return params[0].add(params[1]); } }; /** @@ -68,16 +64,12 @@ public class StandardPlugin extends Plugin { public static final NumberOperator OP_MULTIPLY = new NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) { @Override public boolean matchesParams(NumberInterface[] params) { - return params.length >= 1; + return params.length == 2; } @Override public NumberInterface applyInternal(NumberInterface[] params) { - NumberInterface product = params[0]; - for (int i = 1; i < params.length; i++) { - product = product.multiply(params[i]); - } - return product; + return params[0].multiply(params[1]); } }; /**