diff options
Diffstat (limited to 'dice-lang/src/bjc/dicelang/DiceExpressionParser.java')
| -rw-r--r-- | dice-lang/src/bjc/dicelang/DiceExpressionParser.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/dice-lang/src/bjc/dicelang/DiceExpressionParser.java b/dice-lang/src/bjc/dicelang/DiceExpressionParser.java index 8a1552a..6e15e63 100644 --- a/dice-lang/src/bjc/dicelang/DiceExpressionParser.java +++ b/dice-lang/src/bjc/dicelang/DiceExpressionParser.java @@ -89,51 +89,51 @@ public class DiceExpressionParser { /* * Apply an operation to two dice */ - IDiceExpression rightExpression = expressions + IDiceExpression right = expressions .pop(); - IDiceExpression leftExpression = expressions.pop(); + IDiceExpression left = expressions.pop(); switch (expressionPart) { case ":=": expressions.push(new BindingDiceExpression( - leftExpression, rightExpression, + left, right, enviroment)); break; case "+": expressions .push(new OperatorDiceExpression( - rightExpression, - leftExpression, + right, + left, DiceExpressionType.ADD)); break; case "-": expressions .push(new OperatorDiceExpression( - rightExpression, - leftExpression, + right, + left, DiceExpressionType.SUBTRACT)); break; case "*": expressions .push(new OperatorDiceExpression( - rightExpression, - leftExpression, + right, + left, DiceExpressionType.MULTIPLY)); break; case "/": expressions .push(new OperatorDiceExpression( - rightExpression, - leftExpression, + right, + left, DiceExpressionType.DIVIDE)); break; case "c": expressions.push(new CompoundDice( - leftExpression, rightExpression)); + left, right)); break; case "d": expressions.push(new ComplexDice( - leftExpression, rightExpression)); + left, right)); break; default: /* @@ -141,8 +141,8 @@ public class DiceExpressionParser { * * Make sure to restore popped variables */ - expressions.push(leftExpression); - expressions.push(rightExpression); + expressions.push(left); + expressions.push(right); expressions .push(new ReferenceDiceExpression( |