From 530593d97fa55ec3044f5b6baff3e40e8b37342a Mon Sep 17 00:00:00 2001 From: Arnstein Ressem Date: Tue, 20 Sep 2022 22:54:04 +0200 Subject: Revert "Short circuit boolean expressions" --- .../expressions/ArithmeticExpression.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'indexinglanguage') diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java index e4bc2dae965..fa82c4d88ee 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java @@ -166,13 +166,19 @@ public final class ArithmeticExpression extends CompositeExpression { } BigDecimal lhsVal = asBigDecimal((NumericFieldValue)lhs); BigDecimal rhsVal = asBigDecimal((NumericFieldValue)rhs); - return switch (op) { - case ADD -> createFieldValue(lhs, rhs, lhsVal.add(rhsVal)); - case SUB -> createFieldValue(lhs, rhs, lhsVal.subtract(rhsVal)); - case MUL -> createFieldValue(lhs, rhs, lhsVal.multiply(rhsVal)); - case DIV -> createFieldValue(lhs, rhs, lhsVal.divide(rhsVal, MathContext.DECIMAL64)); - case MOD -> createFieldValue(lhs, rhs, lhsVal.remainder(rhsVal)); - }; + switch (op) { + case ADD: + return createFieldValue(lhs, rhs, lhsVal.add(rhsVal)); + case SUB: + return createFieldValue(lhs, rhs, lhsVal.subtract(rhsVal)); + case MUL: + return createFieldValue(lhs, rhs, lhsVal.multiply(rhsVal)); + case DIV: + return createFieldValue(lhs, rhs, lhsVal.divide(rhsVal, MathContext.DECIMAL64)); + case MOD: + return createFieldValue(lhs, rhs, lhsVal.remainder(rhsVal)); + } + throw new IllegalStateException("Unsupported operation: " + op); } private FieldValue createFieldValue(FieldValue lhs, FieldValue rhs, BigDecimal val) { -- cgit v1.2.3