Work on optimizations

1 files changed, 15 insertions, 1 deletions

diff --git a/dice-lang/src/main/java/bjc/dicelang/ComplexDice.java b/dice-lang/src/main/java/bjc/dicelang/ComplexDice.java
index 054c73b..9fa324b 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ComplexDice.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ComplexDice.java
@@ -15,7 +15,7 @@ public class ComplexDice implements IDiceExpression {
 	 *            The string to parse the dice from
 	 * @return A dice group parsed from the string
 	 */
-	public static ComplexDice fromString(String dice) {
+	public static IDiceExpression fromString(String dice) {
 		/*
 		 * Split it on the dice type marker
 		 */
@@ -116,4 +116,18 @@ public class ComplexDice implements IDiceExpression {
 					+ die.toString() + "]";
 		}
 	}
+
+	@Override
+	public boolean canOptimize() {
+		if (nDice.canOptimize() && die.canOptimize()) {
+			return die.optimize() == 1;
+		}
+
+		return false;
+	}
+
+	@Override
+	public int optimize() {
+		return nDice.optimize();
+	}
 }
\ No newline at end of file