Cleanup

10 files changed, 41 insertions, 48 deletions

diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceASTType.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceASTType.java
index ea85b2a..47e8b39 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceASTType.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceASTType.java
@@ -2,7 +2,7 @@ package bjc.dicelang.v1.ast.nodes;
 
 /**
  * An enum to represent the type of node an AST node is
- * 
+ *
  * @author ben
  *
  */
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralNode.java
index bb979d1..4241463 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralNode.java
@@ -4,7 +4,7 @@ import bjc.dicelang.v1.IDiceExpression;
 
 /**
  * Represents a literal backed by a dice expression
- * 
+ *
  * @author ben
  *
  */
@@ -13,7 +13,7 @@ public class DiceLiteralNode implements ILiteralDiceNode {
 
 	/**
 	 * Create a new literal from an expression
-	 * 
+	 *
 	 * @param exp
 	 *                The expression to attempt to create a literal from
 	 */
@@ -33,7 +33,7 @@ public class DiceLiteralNode implements ILiteralDiceNode {
 
 	/**
 	 * Return the expression being represented
-	 * 
+	 *
 	 * @return The expression being represented
 	 */
 	public IDiceExpression getValue() {
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralType.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralType.java
index 9440f85..d48104c 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralType.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceLiteralType.java
@@ -2,7 +2,7 @@ package bjc.dicelang.v1.ast.nodes;
 
 /**
  * Represents the type of literals that can be in an AST
- * 
+ *
  * @author ben
  *
  */
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceOperatorType.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceOperatorType.java
index a5a79a6..b842604 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceOperatorType.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/DiceOperatorType.java
@@ -2,10 +2,10 @@ package bjc.dicelang.v1.ast.nodes;
 
 /**
  * Represents the different type of operators.
- * 
+ *
  * Mostly, what distinguishes groups is that all the operators in a group have
  * similiar precedence, and operate on similiar things
- * 
+ *
  * @author ben
  *
  */
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/IDiceASTNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/IDiceASTNode.java
index 219cf4a..7e8bb81 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/IDiceASTNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/IDiceASTNode.java
@@ -2,21 +2,21 @@ package bjc.dicelang.v1.ast.nodes;
 
 /**
  * The interface for a node in a dice AST
- * 
+ *
  * @author ben
  *
  */
 public interface IDiceASTNode {
 	/**
 	 * Get the type of AST node this node is
-	 * 
+	 *
 	 * @return The type of AST node this AST node is
 	 */
 	public DiceASTType getType();
 
 	/**
 	 * Check if this node represents an operator or not
-	 * 
+	 *
 	 * @return Whether or not this node represents an operator
 	 */
 	public boolean isOperator();
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/ILiteralDiceNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/ILiteralDiceNode.java
index ece528b..5a3f5b3 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/ILiteralDiceNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/ILiteralDiceNode.java
@@ -2,14 +2,14 @@ package bjc.dicelang.v1.ast.nodes;
 
 /**
  * Represents a literal of some type in the AST
- * 
+ *
  * @author ben
  *
  */
 public interface ILiteralDiceNode extends IDiceASTNode {
 	/**
 	 * Check if a token represents a literal, and if so, what type
-	 * 
+	 *
 	 * @param tok
 	 *                The token to check
 	 * @return The type the literal would be if it is one, or null otherwise
@@ -19,18 +19,15 @@ public interface ILiteralDiceNode extends IDiceASTNode {
 
 		String diceGroupOrNumber = "[(?:" + diceGroup + ")(?:\\d+)]";
 
-		if (tok.matches("\\A" + diceGroupOrNumber + "?" + "c" + diceGroupOrNumber + "\\Z")) {
+		if(tok.matches("\\A" + diceGroupOrNumber + "?" + "c" + diceGroupOrNumber + "\\Z"))
 			return DiceLiteralType.DICE;
-		}
 
-		if (tok.matches("\\A" + diceGroup + "Z")) {
-			return DiceLiteralType.DICE;
-		}
+		if(tok.matches("\\A" + diceGroup + "Z")) return DiceLiteralType.DICE;
 
 		try {
 			Integer.parseInt(tok);
 			return DiceLiteralType.INTEGER;
-		} catch (NumberFormatException nfex) {
+		} catch(NumberFormatException nfex) {
 			// We don't care about details
 			// This probably shouldn't return null, but I believe it
 			// does so
@@ -41,7 +38,7 @@ public interface ILiteralDiceNode extends IDiceASTNode {
 
 	/**
 	 * Check if this node can be optimized to a constant
-	 * 
+	 *
 	 * @return Whether or not this node can be optimized to a constant
 	 * @see bjc.dicelang.v1.IDiceExpression#canOptimize()
 	 */
@@ -49,7 +46,7 @@ public interface ILiteralDiceNode extends IDiceASTNode {
 
 	/**
 	 * Get the type of literal this node represents
-	 * 
+	 *
 	 * @return The type of literal this node represents
 	 */
 	DiceLiteralType getLiteralType();
@@ -66,7 +63,7 @@ public interface ILiteralDiceNode extends IDiceASTNode {
 
 	/**
 	 * Optimize this node to a constant if possible
-	 * 
+	 *
 	 * @return This node in constant form if possible
 	 * @see bjc.dicelang.v1.IDiceExpression#optimize()
 	 */
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/IntegerLiteralNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/IntegerLiteralNode.java
index 1c8aa56..fd1a1e6 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/IntegerLiteralNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/IntegerLiteralNode.java
@@ -2,7 +2,7 @@ package bjc.dicelang.v1.ast.nodes;
 
 /**
  * Represents an integer literal of some kind
- * 
+ *
  * @author ben
  *
  */
@@ -11,7 +11,7 @@ public class IntegerLiteralNode implements ILiteralDiceNode {
 
 	/**
 	 * Create a new integer literal from the given number
-	 * 
+	 *
 	 * @param val
 	 *                The value this node represents
 	 */
@@ -31,7 +31,7 @@ public class IntegerLiteralNode implements ILiteralDiceNode {
 
 	/**
 	 * Get the value this node represents
-	 * 
+	 *
 	 * @return The integer value of this node
 	 */
 	public int getValue() {
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/OperatorDiceNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/OperatorDiceNode.java
index 0af9d81..0181314 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/OperatorDiceNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/OperatorDiceNode.java
@@ -6,7 +6,7 @@ import static bjc.dicelang.v1.ast.nodes.DiceOperatorType.MATH;
 
 /**
  * A node that represents an operator
- * 
+ *
  * @author ben
  *
  */
@@ -50,13 +50,13 @@ public enum OperatorDiceNode implements IDiceASTNode {
 
 	/**
 	 * Create a operator node from a string
-	 * 
+	 *
 	 * @param s
 	 *                The string to convert to a node
 	 * @return The operator corresponding to the node
 	 */
 	public static OperatorDiceNode fromString(String s) {
-		switch (s) {
+		switch(s) {
 		case ":=":
 			return ASSIGN;
 		case "+":
@@ -84,7 +84,7 @@ public enum OperatorDiceNode implements IDiceASTNode {
 
 	/**
 	 * Represents the group of operator this operator is sorted into.
-	 * 
+	 *
 	 */
 	public final DiceOperatorType type;
 
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/VariableDiceNode.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/VariableDiceNode.java
index 22ddf17..e44f2ab 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/VariableDiceNode.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/VariableDiceNode.java
@@ -2,7 +2,7 @@ package bjc.dicelang.v1.ast.nodes;
 
 /**
  * A node that represents a reference to a variable
- * 
+ *
  * @author ben
  *
  */
@@ -14,7 +14,7 @@ public class VariableDiceNode implements IDiceASTNode {
 
 	/**
 	 * Create a new node representing the specified variable
-	 * 
+	 *
 	 * @param varName
 	 *                The name of the variable being referenced
 	 */
@@ -24,28 +24,24 @@ public class VariableDiceNode implements IDiceASTNode {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	@Override
 	public boolean equals(Object obj) {
 		// Handle special cases
-		if (this == obj) {
+		if(this == obj)
 			return true;
-		} else if (obj == null) {
+		else if(obj == null)
 			return false;
-		} else if (getClass() != obj.getClass()) {
+		else if(getClass() != obj.getClass())
 			return false;
-		} else {
+		else {
 			VariableDiceNode other = (VariableDiceNode) obj;
 
-			if (variableName == null) {
-				if (other.variableName != null) {
-					return false;
-				}
-			} else if (!variableName.equals(other.variableName)) {
-				return false;
-			}
+			if(variableName == null) {
+				if(other.variableName != null) return false;
+			} else if(!variableName.equals(other.variableName)) return false;
 
 			return true;
 		}
@@ -58,7 +54,7 @@ public class VariableDiceNode implements IDiceASTNode {
 
 	/**
 	 * Get the variable referenced by this AST node
-	 * 
+	 *
 	 * @return the variable referenced by this AST node
 	 */
 	public String getVariable() {
@@ -67,20 +63,20 @@ public class VariableDiceNode implements IDiceASTNode {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#hashCode()
 	 */
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((variableName == null) ? 0 : variableName.hashCode());
+		result = prime * result + (variableName == null ? 0 : variableName.hashCode());
 		return result;
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see bjc.utils.dice.ast.IDiceASTNode#isOperator()
 	 */
 	@Override
@@ -90,7 +86,7 @@ public class VariableDiceNode implements IDiceASTNode {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
diff --git a/dice-lang/src/bjc/dicelang/v1/ast/nodes/package-info.java b/dice-lang/src/bjc/dicelang/v1/ast/nodes/package-info.java
index 098157d..cdd63e9 100644
--- a/dice-lang/src/bjc/dicelang/v1/ast/nodes/package-info.java
+++ b/dice-lang/src/bjc/dicelang/v1/ast/nodes/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Classes for nodes in the dice-lang AST
- * 
+ *
  * @author ben
  *
  */