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-27 17:42:35 -0400
committerbculkin2442 <bjculkin@mix.wvu.edu>2016-07-27 17:42:35 -0400
commit67fee39e6dd22fce8dfaa800f0a5ddbe0ede0be3 (patch)
tree76db8ccbfb360ce1e4abe8b293fd86a5a95ce923 /dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java
parentbfa7c67f491d8f693308e6299266f527b49be600 (diff)
General cleanup
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.java6
1 files changed, 4 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 3820d68..e481e5e 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java
@@ -18,8 +18,10 @@ import bjc.dicelang.ast.nodes.OperatorDiceNode;
*
*/
final class ArithmeticCollapser implements IOperatorCollapser {
+ // The type of operator we're collapsing
private OperatorDiceNode type;
+ // The operator to use to collapse operators
private BinaryOperator<Integer> valueOp;
public ArithmeticCollapser(OperatorDiceNode type,
@@ -31,7 +33,7 @@ final class ArithmeticCollapser implements IOperatorCollapser {
@Override
public IPair<IResult, ITree<IDiceASTNode>> apply(
IList<IPair<IResult, ITree<IDiceASTNode>>> nodes) {
- IPair<IResult, ITree<IDiceASTNode>> initState = new Pair<>(
+ IPair<IResult, ITree<IDiceASTNode>> initialState = new Pair<>(
new IntegerResult(0), new Tree<>(type));
BinaryOperator<IPair<IResult, ITree<IDiceASTNode>>> reducer = (
@@ -44,7 +46,7 @@ final class ArithmeticCollapser implements IOperatorCollapser {
};
IPair<IResult, ITree<IDiceASTNode>> reducedState = nodes
- .reduceAux(initState, reducer, (state) -> state);
+ .reduceAux(initialState, reducer, (state) -> state);
return reducedState;
}