diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2017-02-21 13:48:12 -0500 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2017-02-21 13:48:12 -0500 |
| commit | fc0a33e00865b6ea66d3e1b8ce785ef02682a23b (patch) | |
| tree | 4218362dad96cc86190b93d057db2d3a7227efd5 /dice-lang | |
| parent | 066f03d698601584e053b4f56350a04eec03d88f (diff) | |
Error & dice handling
Diffstat (limited to 'dice-lang')
| -rw-r--r-- | dice-lang/src/bjc/dicelang/v2/DiceBox.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceBox.java b/dice-lang/src/bjc/dicelang/v2/DiceBox.java index 342ea2e..8297e24 100644 --- a/dice-lang/src/bjc/dicelang/v2/DiceBox.java +++ b/dice-lang/src/bjc/dicelang/v2/DiceBox.java @@ -461,7 +461,7 @@ public class DiceBox { private static final String compoundDie = simpleDie + "c(?:(?:" + simpleDie + ")|(?:\\d+))"; private static final Pattern compoundDiePattern = Pattern.compile("\\A" + compoundDie + "\\Z"); - private static final String compoundGroup = "(?:(?:\\d+)|(?:" + simpleDie + ")|(?:" + private static final String compoundGroup = "(?:(?:" + scalarDie + ")|(?:" + simpleDie + ")|(?:" + compoundDie + ")|(?:" + fudgeDie +"))"; private static final String compoundingDie = compoundGroup + "!!" + comparePoint; @@ -476,7 +476,6 @@ public class DiceBox { private static final String diceList = compoundGroup + "dl" + compoundGroup; private static final Pattern diceListPattern = Pattern.compile("\\A" + diceList + "\\Z"); - public static boolean isValidExpression(String exp) { if(scalarDiePattern.matcher(exp).matches()) { return true; |