diff options
Diffstat (limited to 'dice-lang/src/bjc/dicelang/ast')
| -rw-r--r-- | dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java | 8 | ||||
| -rw-r--r-- | dice-lang/src/bjc/dicelang/ast/nodes/OperatorDiceNode.java | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java b/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java index b94bcc8..e37b6da 100644 --- a/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java +++ b/dice-lang/src/bjc/dicelang/ast/nodes/ILiteralDiceNode.java @@ -16,15 +16,15 @@ public interface ILiteralDiceNode extends IDiceASTNode { * otherwise */ static DiceLiteralType getLiteralType(String tok) { - String diceGroupOrNumber = "[(?:\\d*d\\d+)(?:\\d+)]"; + String diceGroup = "\\d*d\\d+\\"; + + String diceGroupOrNumber = "[(?:" + diceGroup + ")(?:\\d+)]"; if (tok.matches("\\A" + diceGroupOrNumber + "?" + "c" + diceGroupOrNumber + "\\Z")) { return DiceLiteralType.DICE; } - String diceGroup = "\\d*d\\d+\\"; - if (tok.matches("\\A" + diceGroup + "Z")) { return DiceLiteralType.DICE; } @@ -34,6 +34,8 @@ public interface ILiteralDiceNode extends IDiceASTNode { return DiceLiteralType.INTEGER; } catch (@SuppressWarnings("unused") NumberFormatException nfex) { // We don't care about details + // This probably shouldn't return null, but I believe it does so + // because where its called checks that. @FIXME return null; } } diff --git a/dice-lang/src/bjc/dicelang/ast/nodes/OperatorDiceNode.java b/dice-lang/src/bjc/dicelang/ast/nodes/OperatorDiceNode.java index 7c0a29d..b62c15c 100644 --- a/dice-lang/src/bjc/dicelang/ast/nodes/OperatorDiceNode.java +++ b/dice-lang/src/bjc/dicelang/ast/nodes/OperatorDiceNode.java @@ -98,11 +98,6 @@ public enum OperatorDiceNode implements IDiceASTNode { return DiceASTType.OPERATOR; } - /* - * (non-Javadoc) - * - * @see bjc.utils.dice.ast.IDiceASTNode#isOperator() - */ @Override public boolean isOperator() { return true; |