summaryrefslogtreecommitdiff
path: root/dice-lang/src/main/java/bjc/dicelang/ast/optimization
diff options
context:
space:
mode:
Diffstat (limited to 'dice-lang/src/main/java/bjc/dicelang/ast/optimization')
-rw-r--r--dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java4
-rw-r--r--dice-lang/src/main/java/bjc/dicelang/ast/optimization/ConstantCollapser.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java
index 70e518e..960fbf7 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ast/optimization/ArithmeticCollapser.java
@@ -39,12 +39,12 @@ class ArithmeticCollapser {
return new Tree<>(type, children);
}
- int initState = DiceASTUtils.toInt(children.first());
+ int initState = DiceASTUtils.literalToInteger(children.first());
return children.tail().reduceAux(initState,
(currentNode, state) -> {
return reducer.apply(state,
- DiceASTUtils.toInt(currentNode));
+ DiceASTUtils.literalToInteger(currentNode));
}, (state) -> new Tree<>(new IntegerLiteralNode(state)));
}
}
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 3b43ff6..6749cab 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
@@ -64,8 +64,8 @@ public class ConstantCollapser implements IOptimizationPass {
}
ComplexDice dice = new ComplexDice(
- DiceASTUtils.toExpression(children.getByIndex(0)),
- DiceASTUtils.toExpression(children.getByIndex(1)));
+ DiceASTUtils.literalToExpression(children.getByIndex(0)),
+ DiceASTUtils.literalToExpression(children.getByIndex(1)));
if (dice.canOptimize()) {
return new Tree<>(