From fc0a33e00865b6ea66d3e1b8ce785ef02682a23b Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Tue, 21 Feb 2017 13:48:12 -0500 Subject: Error & dice handling --- dice-lang/src/bjc/dicelang/v2/DiceBox.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dice-lang/src/bjc/dicelang/v2/DiceBox.java') 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; -- cgit v1.2.3