diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java index 8f3fe1d..e0f276d 100644 --- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java +++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java @@ -14,7 +14,7 @@ import bjc.dicelang.ast.DiceASTParser; import bjc.dicelang.ast.IDiceASTNode; import bjc.dicelang.ast.VariableDiceNode; import bjc.utils.data.GenHolder; -import bjc.utils.funcdata.ITreePart.TreeLinearizationMethod; +import bjc.utils.funcdata.bst.ITreePart.TreeLinearizationMethod; import bjc.utils.parserutils.AST; /** diff --git a/dice-lang/src/main/java/bjc/dicelang/CompoundDiceExpression.java b/dice-lang/src/main/java/bjc/dicelang/CompoundDiceExpression.java index 162317b..8db481f 100644 --- a/dice-lang/src/main/java/bjc/dicelang/CompoundDiceExpression.java +++ b/dice-lang/src/main/java/bjc/dicelang/CompoundDiceExpression.java @@ -61,7 +61,7 @@ public class CompoundDiceExpression implements IDiceExpression { * Round to keep results as integers. We don't really have * any need for floating-point dice */ - return Math.round(right.roll() / left.roll()); + return right.roll() / left.roll(); default: throw new IllegalArgumentException( "Got passed a invalid ScalarExpressionType " + det diff --git a/dice-lang/src/main/java/bjc/dicelang/ScalarDiceExpression.java b/dice-lang/src/main/java/bjc/dicelang/ScalarDiceExpression.java index a7aae83..be0cbb6 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ScalarDiceExpression.java +++ b/dice-lang/src/main/java/bjc/dicelang/ScalarDiceExpression.java @@ -54,7 +54,7 @@ public class ScalarDiceExpression implements IDiceExpression { case MULTIPLY: return exp.roll() * scalar; case DIVIDE: - return Math.round(exp.roll() / scalar); + return exp.roll() / scalar; default: throw new IllegalStateException( "Got passed a invalid ScalarExpressionType " diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTExpression.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTExpression.java index 6e9b836..a79c466 100644 --- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTExpression.java +++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTExpression.java @@ -66,7 +66,7 @@ public class DiceASTExpression implements IDiceExpression { return left.merge((lval, last) -> right.merge((rval, rast) -> { String nam = last.collapse((nod) -> { return ((VariableDiceNode) nod).getVariable(); - } , (v) -> (lv, rv) -> null, (r) -> r); + }, (v) -> (lv, rv) -> null, (r) -> r); env.put(nam, new DiceASTExpression(rast, env)); |