diff options
Diffstat (limited to 'dice-lang/src/main/java')
4 files changed, 12 insertions, 10 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); } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java index 0d57c57..9a36951 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java @@ -53,7 +53,7 @@ public class DiceASTParser { throw new InputMismatchException( "Floating point literals are not supported"); } - + return new VariableDiceNode(leafNode); } diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java b/dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java index eeda874..a84bb7c 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DummyResult.java @@ -10,11 +10,6 @@ public class DummyResult implements IResult { dummyData = data; } - @Override - public ResultType getType() { - return ResultType.DUMMY; - } - /** * Get the data in this dummy * @@ -25,6 +20,11 @@ public class DummyResult implements IResult { } @Override + public ResultType getType() { + return ResultType.DUMMY; + } + + @Override public String toString() { return "Dummy with reason " + dummyData; } 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 35148fa..95badd2 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,10 @@ public class ConstantCollapser implements IOptimizationPass { } ComplexDice dice = new ComplexDice( - DiceASTUtils.literalToExpression(children.getByIndex(0)), - DiceASTUtils.literalToExpression(children.getByIndex(1))); + DiceASTUtils.literalToExpression( + children.getByIndex(0)), + DiceASTUtils.literalToExpression( + children.getByIndex(1))); if (dice.canOptimize()) { return new Tree<>( |