Formatting pass

6 files changed, 19 insertions, 29 deletions

diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java
index 4ba5d01..1716698 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java
@@ -27,7 +27,7 @@ import bjc.dicelang.ast.optimization.OperationCondenser;
 public class DiceASTLanguageTest {
 	private static IMap<String, DiceASTPragma>	actions;
 
-	private static DiceASTOptimizer							optimizer;
+	private static DiceASTOptimizer				optimizer;
 
 	static {
 		actions = new FunctionalMap<>();
@@ -70,8 +70,7 @@ public class DiceASTLanguageTest {
 			String inlineExpression = pragmaArgs.getByIndex(0);
 			String variableName = pragmaArgs.getByIndex(1);
 
-			IList<String> inlinedVariables = pragmaArgs.tail()
-					.tail();
+			IList<String> inlinedVariables = pragmaArgs.tail().tail();
 
 			ITree<IDiceASTNode> inlinedExpression = DiceASTInliner
 					.selectiveInline(enviroment.get(inlineExpression),
@@ -101,10 +100,6 @@ public class DiceASTLanguageTest {
 			String possibleActionName = currentLine.split(" ")[0];
 
 			if (actions.containsKey(possibleActionName)) {
-				System.err.println(
-						"\nTRACE: Executing action " + possibleActionName
-								+ " with line " + currentLine + "\n");
-
 				// Execute action
 				FunctionalStringTokenizer tokenizer = new FunctionalStringTokenizer(
 						currentLine);
diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java
index 7489b5c..b9b4aab 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java
@@ -60,8 +60,8 @@ public class DiceExpressionPreparer {
 		ops.add(new Pair<>(":=", ":="));
 		ops.add(new Pair<>("=>", "=>"));
 
-		IList<String> semiExpandedTokens = ListUtils
-				.splitTokens(tokens, ops);
+		IList<String> semiExpandedTokens = ListUtils.splitTokens(tokens,
+				ops);
 
 		ops = new LinkedList<>();
 
diff --git a/dice-lang/src/main/java/bjc/dicelang/DiceExpressionParser.java b/dice-lang/src/main/java/bjc/dicelang/DiceExpressionParser.java
index 0b20934..8a1552a 100644
--- a/dice-lang/src/main/java/bjc/dicelang/DiceExpressionParser.java
+++ b/dice-lang/src/main/java/bjc/dicelang/DiceExpressionParser.java
@@ -51,8 +51,7 @@ public class DiceExpressionParser {
 		/*
 		 * Shunt the expression to postfix form
 		 */
-		IList<String> list = yard.postfix(tokenizer.toList(),
-				s -> s);
+		IList<String> list = yard.postfix(tokenizer.toList(), s -> s);
 
 		/*
 		 * Create a stack for building an expression from parts
diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java
index ac53c81..3820d68 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ast/ArithmeticCollapser.java
@@ -49,8 +49,8 @@ final class ArithmeticCollapser implements IOperatorCollapser {
 		return reducedState;
 	}
 
-	private IList<IResult> combineArrayResults(
-			IResult accumulatedValue, IResult currentValue) {
+	private IList<IResult> combineArrayResults(IResult accumulatedValue,
+			IResult currentValue) {
 		IList<IResult> currentList = ((ArrayResult) currentValue)
 				.getValue();
 		IList<IResult> accumulatedList = ((ArrayResult) accumulatedValue)
@@ -126,9 +126,8 @@ final class ArithmeticCollapser implements IOperatorCollapser {
 				accumulatedTree);
 	}
 
-	private IList<IResult> halfCombineLists(
-			IList<IResult> list, IResult scalar,
-			boolean scalarLeft) {
+	private IList<IResult> halfCombineLists(IList<IResult> list,
+			IResult scalar, boolean scalarLeft) {
 		if (scalar.getType() != ResultType.INTEGER) {
 			throw new UnsupportedOperationException(
 					"Nested array operations not supported");
diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java
index ea5a844..7f5f2d7 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTInliner.java
@@ -35,8 +35,7 @@ public class DiceASTInliner {
 
 	private static ITree<IDiceASTNode> inlineNode(IDiceASTNode node,
 			IMap<String, ITree<IDiceASTNode>> enviroment,
-			boolean specificInline,
-			IList<String> variableNames) {
+			boolean specificInline, IList<String> variableNames) {
 		if (node.getType() != DiceASTType.VARIABLE) {
 			return new Tree<>(node);
 		}
@@ -101,8 +100,7 @@ public class DiceASTInliner {
 			IMap<String, ITree<IDiceASTNode>> enviroment,
 			String... variables) {
 		if (variables != null && variables.length > 0) {
-			IList<String> variableNames = new FunctionalList<>(
-					variables);
+			IList<String> variableNames = new FunctionalList<>(variables);
 
 			return ast.flatMapTree((node) -> {
 				return inlineNode(node, enviroment, true, variableNames);
diff --git a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java
index c149c0a..bd6011e 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java
@@ -31,8 +31,8 @@ import bjc.dicelang.ast.nodes.VariableDiceNode;
  */
 public class DiceASTParser {
 	private static IDiceASTNode convertLeafNode(String leafNode) {
-		DiceLiteralType literalType =
-				ILiteralDiceNode.getLiteralType(leafNode);
+		DiceLiteralType literalType = ILiteralDiceNode
+				.getLiteralType(leafNode);
 
 		if (literalType != null) {
 			switch (literalType) {
@@ -84,8 +84,7 @@ public class DiceASTParser {
 			return false;
 		};
 
-		IMap<String, Function<Deque<ITree<String>>, ITree<String>>> operators =
-				new FunctionalMap<>();
+		IMap<String, Function<Deque<ITree<String>>, ITree<String>>> operators = new FunctionalMap<>();
 
 		operators.put("[", (queuedTrees) -> {
 			Tree<String> openTree = new Tree<>("[");
@@ -97,14 +96,14 @@ public class DiceASTParser {
 			return parseCloseArray(queuedTrees);
 		});
 
-		ITree<String> rawTokens =
-				TreeConstructor.constructTree(tokens, (token) -> {
+		ITree<String> rawTokens = TreeConstructor.constructTree(tokens,
+				(token) -> {
 					return isOperatorNode(token);
 				}, specialPicker, operators::get);
 
-		ITree<IDiceASTNode> tokenizedTree =
-				rawTokens.rebuildTree(DiceASTParser::convertLeafNode,
-						DiceASTParser::convertOperatorNode);
+		ITree<IDiceASTNode> tokenizedTree = rawTokens.rebuildTree(
+				DiceASTParser::convertLeafNode,
+				DiceASTParser::convertOperatorNode);
 
 		return tokenizedTree;
 	}