diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-04-22 14:29:19 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-04-22 14:29:19 -0400 |
| commit | a3e0b3da5d7b0ec8dcae92a428f8e3f1c6cd6e8e (patch) | |
| tree | bd23ebdddaa0fdfd223afdcb66b41104c2a1ebaa /dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java | |
| parent | ece202806a0621329a9c301996d0f519b018e9bd (diff) | |
Formatting changes
Diffstat (limited to 'dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java')
| -rw-r--r-- | dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java index 7b746ac..63c9037 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java @@ -1,13 +1,14 @@ package bjc.dicelang.ast.optimization; +import bjc.utils.funcdata.IFunctionalList; +import bjc.utils.funcdata.ITree; +import bjc.utils.funcdata.Tree; + import bjc.dicelang.ComplexDice; import bjc.dicelang.ast.DiceASTUtils; import bjc.dicelang.ast.nodes.IDiceASTNode; import bjc.dicelang.ast.nodes.IntegerLiteralNode; import bjc.dicelang.ast.nodes.OperatorDiceNode; -import bjc.utils.funcdata.IFunctionalList; -import bjc.utils.funcdata.ITree; -import bjc.utils.funcdata.Tree; /** * Collapses operations with constants to constants @@ -16,27 +17,22 @@ import bjc.utils.funcdata.Tree; * */ public class ConstantCollapser implements IOptimizationPass { - private static final ArithmeticCollapser additionCollapser = - new ArithmeticCollapser((left, right) -> left + right, - OperatorDiceNode.ADD); + private static final ArithmeticCollapser additionCollapser = new ArithmeticCollapser( + (left, right) -> left + right, OperatorDiceNode.ADD); - private static final ArithmeticCollapser divideCollapser = - new ArithmeticCollapser((left, right) -> left / right, - OperatorDiceNode.DIVIDE); + private static final ArithmeticCollapser divideCollapser = new ArithmeticCollapser( + (left, right) -> left / right, OperatorDiceNode.DIVIDE); - private static final ArithmeticCollapser multiplyCollapser = - new ArithmeticCollapser((left, right) -> left * right, - OperatorDiceNode.MULTIPLY); + private static final ArithmeticCollapser multiplyCollapser = new ArithmeticCollapser( + (left, right) -> left * right, OperatorDiceNode.MULTIPLY); - private static final ArithmeticCollapser subtractCollapser = - new ArithmeticCollapser((left, right) -> left - right, - OperatorDiceNode.SUBTRACT); + private static final ArithmeticCollapser subtractCollapser = new ArithmeticCollapser( + (left, right) -> left - right, OperatorDiceNode.SUBTRACT); - private static final ArithmeticCollapser compoundCollapser = - new ArithmeticCollapser((left, - right) -> Integer.parseInt(Integer.toString(left) - + Integer.toString(left)), - OperatorDiceNode.SUBTRACT); + private static final ArithmeticCollapser compoundCollapser = new ArithmeticCollapser( + (left, right) -> Integer.parseInt( + Integer.toString(left) + Integer.toString(left)), + OperatorDiceNode.SUBTRACT); @Override public ITree<IDiceASTNode> optimizeLeaf(IDiceASTNode leafNode) { |