summaryrefslogtreecommitdiff
path: root/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java
diff options
context:
space:
mode:
authorbculkin2442 <bjculkin@mix.wvu.edu>2016-07-28 16:45:16 -0400
committerbculkin2442 <bjculkin@mix.wvu.edu>2016-07-28 16:45:16 -0400
commitbb27392419549bb40cbc4f194e38f471d2b9f63d (patch)
tree981e5d506441b678d307df0999a24a0ea95cbb88 /dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java
parentd80f404865656b6d1a8faf41cecdd61343adcd0b (diff)
Format/cleanup pass
Diffstat (limited to 'dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java')
-rw-r--r--dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java4
1 files changed, 2 insertions, 2 deletions
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);
}