General cleanup and fixes

1 files changed, 66 insertions, 64 deletions

diff --git a/dice-lang/src/bjc/dicelang/dice/DieExpression.java b/dice-lang/src/bjc/dicelang/dice/DieExpression.java
index 576660d..92625eb 100644
--- a/dice-lang/src/bjc/dicelang/dice/DieExpression.java
+++ b/dice-lang/src/bjc/dicelang/dice/DieExpression.java
@@ -1,64 +1,66 @@
-package bjc.dicelang.dice;

-

-import java.util.Arrays;

-

-/**

- * Represents either a die or a die list

- *

- * @author Ben Culkin

- */

-public class DieExpression {

-	/**

-	 * Is this expression a list?

-	 */

-	public final boolean isList;

-

-	/**

-	 * The scalar value in this expression, if there is one.

-	 */

-	public Die	scalar;

-	/**

-	 * The list value in this expression, if there is one.

-	 */

-	public DieList	list;

-

-	/**

-	 * Create a scalar die expression.

-	 *

-	 * @param scal

-	 *                The scalar value of this expression.

-	 */

-	public DieExpression(Die scal) {

-		isList = false;

-		scalar = scal;

-	}

-

-	/**

-	 * Create a list die expression.

-	 *

-	 * @param lst

-	 *                The list value of this expression.

-	 */

-	public DieExpression(DieList lst) {

-		isList = true;

-		list = lst;

-	}

-

-	@Override

-	public String toString() {

-		if(isList)

-			return list.toString();

-		else

-			return scalar.toString();

-	}

-

-	/**

-	 * Get the value of this expression as a string.

-	 */

-	public String value() {

-		if(isList)

-			return Arrays.toString(list.roll());

-		else

-			return Long.toString(scalar.roll());

-	}

-}

+package bjc.dicelang.dice;
+
+import java.util.Arrays;
+
+/**
+ * Represents either a die or a die list.
+ *
+ * @author Ben Culkin
+ */
+public class DieExpression {
+	/**
+	 * Is this expression a list?
+	 */
+	public final boolean isList;
+
+	/**
+	 * The scalar value in this expression, if there is one.
+	 */
+	public Die	scalar;
+	/**
+	 * The list value in this expression, if there is one.
+	 */
+	public DieList	list;
+
+	/**
+	 * Create a scalar die expression.
+	 *
+	 * @param scal
+	 *                The scalar value of this expression.
+	 */
+	public DieExpression(Die scal) {
+		isList = false;
+		scalar = scal;
+	}
+
+	/**
+	 * Create a list die expression.
+	 *
+	 * @param lst
+	 *                The list value of this expression.
+	 */
+	public DieExpression(DieList lst) {
+		isList = true;
+		list = lst;
+	}
+
+	@Override
+	public String toString() {
+		if(isList)
+			return list.toString();
+		else
+			return scalar.toString();
+	}
+
+	/**
+	 * Get the value of this expression as a string.
+	 * 
+	 * @return The value of the expression as a string.
+	 */
+	public String value() {
+		if(isList)
+			return Arrays.toString(list.roll());
+		else
+			return Long.toString(scalar.roll());
+	}
+}