Renamed packages to suit updated project

1 files changed, 153 insertions, 0 deletions

diff --git a/dice-lang/src/main/java/bjc/dicelang/DiceExpressionBuilder.java b/dice-lang/src/main/java/bjc/dicelang/DiceExpressionBuilder.java
new file mode 100644
index 0000000..5ced36d
--- /dev/null
+++ b/dice-lang/src/main/java/bjc/dicelang/DiceExpressionBuilder.java
@@ -0,0 +1,153 @@
+package bjc.dicelang;
+
+import static bjc.dicelang.DiceExpressionType.*;
+
+/**
+ * Build a dice expression piece by piece
+ * 
+ * @author ben
+ *
+ */
+public class DiceExpressionBuilder {
+	/**
+	 * The dice expression we are building
+	 */
+	private IDiceExpression baking;
+
+	/**
+	 * Build a dice expresssion from a seed dice
+	 * 
+	 * @param firstDice
+	 *            The dice to use as a seed
+	 */
+	public DiceExpressionBuilder(ComplexDice firstDice) {
+		baking = firstDice;
+	}
+
+	/**
+	 * Build a dice expression from a seed dice expression
+	 * 
+	 * @param seed
+	 *            The dice expression to use as a seed
+	 */
+	public DiceExpressionBuilder(IDiceExpression seed) {
+		baking = seed;
+	}
+
+	/**
+	 * Build a dice expression from a seed dice
+	 * 
+	 * @param nSides
+	 *            The number of sides in the dice
+	 * @param nDice
+	 *            The number of dice in the group
+	 */
+	public DiceExpressionBuilder(int nSides, int nDice) {
+		baking = new ComplexDice(nSides, nDice);
+	}
+
+	/**
+	 * Add a term to this dice expression
+	 * 
+	 * @param exp
+	 *            The expression to use on the left
+	 * @return A new expression adding the two dice
+	 */
+	public DiceExpressionBuilder add(IDiceExpression exp) {
+		baking = new CompoundDiceExpression(baking, exp, ADD);
+		return this;
+	}
+
+	/**
+	 * Add a scalar to this dice
+	 * 
+	 * @param num
+	 *            The scalar to add to the dice
+	 * @return A dice expression adding a scalar to this
+	 */
+	public DiceExpressionBuilder add(int num) {
+		baking = new ScalarDiceExpression(baking, num, ADD);
+		return this;
+	}
+
+	/**
+	 * Bake the expression being built to completion
+	 * 
+	 * @return A usable dice expression
+	 */
+	public IDiceExpression bake() {
+		return baking;
+	}
+
+	/**
+	 * Divide a term from dice expression
+	 * 
+	 * @param exp
+	 *            The expression to use on the left
+	 * @return A new expression dividing the two dice
+	 */
+	public DiceExpressionBuilder divide(IDiceExpression exp) {
+		baking = new CompoundDiceExpression(baking, exp, DIVIDE);
+		return this;
+	}
+
+	/**
+	 * Divide a scalar from this dice
+	 * 
+	 * @param num
+	 *            The scalar to add to the dice
+	 * @return A dice expression dividing a scalar from this
+	 */
+	public DiceExpressionBuilder divide(int num) {
+		baking = new ScalarDiceExpression(baking, num, DIVIDE);
+		return this;
+	}
+
+	/**
+	 * Multiply a term by this dice expression
+	 * 
+	 * @param exp
+	 *            The expression to use on the left
+	 * @return A new expression multiplying the two dice
+	 */
+	public DiceExpressionBuilder multiply(IDiceExpression exp) {
+		baking = new CompoundDiceExpression(baking, exp, MULTIPLY);
+		return this;
+	}
+
+	/**
+	 * Multiply a scalar by this dice
+	 * 
+	 * @param num
+	 *            The scalar to multiply to the dice
+	 * @return A dice expression multiplying a scalar to this
+	 */
+	public DiceExpressionBuilder multiply(int num) {
+		baking = new ScalarDiceExpression(baking, num, MULTIPLY);
+		return this;
+	}
+
+	/**
+	 * Add a term to this dice expression
+	 * 
+	 * @param exp
+	 *            The expression to use on the left
+	 * @return A new expression adding the two dice
+	 */
+	public DiceExpressionBuilder subtract(IDiceExpression exp) {
+		baking = new CompoundDiceExpression(baking, exp, SUBTRACT);
+		return this;
+	}
+
+	/**
+	 * Add a scalar to this dice
+	 * 
+	 * @param num
+	 *            The scalar to add to the dice
+	 * @return A dice expression adding a scalar to this
+	 */
+	public DiceExpressionBuilder subtract(int num) {
+		baking = new ScalarDiceExpression(baking, num, SUBTRACT);
+		return this;
+	}
+}