From bb27392419549bb40cbc4f194e38f471d2b9f63d Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 28 Jul 2016 16:45:16 -0400 Subject: Format/cleanup pass --- dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java') diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java index 7537005..2b9eaa4 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java @@ -43,7 +43,7 @@ final class ArithmeticCollapser implements IOperatorCollapser { currentState, accumulatedState) -> { // Force evaluation of accumulated state to prevent // certain bugs from occuring - //accumulatedState.merge((l, r) -> null); + // accumulatedState.merge((l, r) -> null); return reduceStates(accumulatedState, currentState); }; @@ -101,7 +101,7 @@ final class ArithmeticCollapser implements IOperatorCollapser { + ") or current dummy (" + ((DummyResult) currentValue).getData() + ")."); - + return new Pair<>(result, accumulatedTree); } -- cgit v1.2.3