From 40858cee415643769ee5f6216b0cd4335996ff2f Mon Sep 17 00:00:00 2001
From: bjculkin <bjculkin@mix.wvu.edu>
Date: Tue, 11 Apr 2017 17:51:13 -0400
Subject: General cleanup and fixes

---
 dice-lang/src/bjc/dicelang/dice/DieExpression.java | 130 +++++++++++----------
 1 file changed, 66 insertions(+), 64 deletions(-)

(limited to 'dice-lang/src/bjc/dicelang/dice/DieExpression.java')

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());
+	}
+}
-- 
cgit v1.2.3