Formatting changes

5 files changed, 32 insertions, 30 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 fb4b086..c52445d 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTLanguageTest.java
@@ -2,6 +2,12 @@ package bjc.dicelang.examples;
 
 import java.util.Scanner;
 
+import bjc.utils.funcdata.FunctionalMap;
+import bjc.utils.funcdata.FunctionalStringTokenizer;
+import bjc.utils.funcdata.IFunctionalList;
+import bjc.utils.funcdata.IFunctionalMap;
+import bjc.utils.funcdata.ITree;
+
 import bjc.dicelang.ast.DiceASTEvaluator;
 import bjc.dicelang.ast.DiceASTInliner;
 import bjc.dicelang.ast.DiceASTOptimizer;
@@ -11,11 +17,6 @@ import bjc.dicelang.ast.IResult;
 import bjc.dicelang.ast.nodes.IDiceASTNode;
 import bjc.dicelang.ast.optimization.ConstantCollapser;
 import bjc.dicelang.ast.optimization.OperationCondenser;
-import bjc.utils.funcdata.FunctionalMap;
-import bjc.utils.funcdata.FunctionalStringTokenizer;
-import bjc.utils.funcdata.IFunctionalList;
-import bjc.utils.funcdata.IFunctionalMap;
-import bjc.utils.funcdata.ITree;
 
 /**
  * Test interface for AST-based dice language
@@ -62,8 +63,8 @@ public class DiceASTLanguageTest {
 			String inlineExpression = pragmaArgs.getByIndex(0);
 			String variableName = pragmaArgs.getByIndex(1);
 
-			IFunctionalList<String> inlinedVariables =
-					pragmaArgs.tail().tail();
+			IFunctionalList<String> inlinedVariables = pragmaArgs.tail()
+					.tail();
 
 			ITree<IDiceASTNode> inlinedExpression = DiceASTInliner
 					.selectiveInline(enviroment.get(inlineExpression),
@@ -87,8 +88,7 @@ public class DiceASTLanguageTest {
 		String currentLine = inputSource.nextLine();
 
 		// The enviroment for variables
-		IFunctionalMap<String, ITree<IDiceASTNode>> enviroment =
-				new FunctionalMap<>();
+		IFunctionalMap<String, ITree<IDiceASTNode>> enviroment = new FunctionalMap<>();
 
 		while (!currentLine.equalsIgnoreCase("quit")) {
 			String possibleActionName = currentLine.split(" ")[0];
@@ -99,8 +99,8 @@ public class DiceASTLanguageTest {
 								+ " with line " + currentLine + "\n");
 
 				// Execute action
-				FunctionalStringTokenizer tokenizer =
-						new FunctionalStringTokenizer(currentLine);
+				FunctionalStringTokenizer tokenizer = new FunctionalStringTokenizer(
+						currentLine);
 
 				actions.get(possibleActionName).accept(tokenizer,
 						enviroment);
@@ -113,9 +113,9 @@ public class DiceASTLanguageTest {
 			// Build an AST from the string expression
 			ITree<IDiceASTNode> builtAST;
 
-			IFunctionalList<String> preparedTokens =
-					DiceExpressionPreparer.prepareCommand(currentLine);
-			
+			IFunctionalList<String> preparedTokens = DiceExpressionPreparer
+					.prepareCommand(currentLine);
+
 			try {
 				builtAST = DiceASTParser.createFromString(preparedTokens);
 			} catch (IllegalStateException isex) {
@@ -129,8 +129,8 @@ public class DiceASTLanguageTest {
 			// Print out results
 			System.out.println("\tParsed: " + builtAST.toString());
 
-			ITree<IDiceASTNode> transformedAST =
-					transformAST(builtAST, enviroment);
+			ITree<IDiceASTNode> transformedAST = transformAST(builtAST,
+					enviroment);
 
 			System.out
 					.println("\tEvaluated: " + transformedAST.toString());
@@ -167,11 +167,11 @@ public class DiceASTLanguageTest {
 	private static ITree<IDiceASTNode> transformAST(
 			ITree<IDiceASTNode> builtAST,
 			IFunctionalMap<String, ITree<IDiceASTNode>> enviroment) {
-		ITree<IDiceASTNode> optimizedTree =
-				optimizer.optimizeTree(builtAST, enviroment);
+		ITree<IDiceASTNode> optimizedTree = optimizer
+				.optimizeTree(builtAST, enviroment);
 
-		ITree<IDiceASTNode> condensedTree =
-				OperationCondenser.condense(optimizedTree);
+		ITree<IDiceASTNode> condensedTree = OperationCondenser
+				.condense(optimizedTree);
 
 		ITree<IDiceASTNode> sanitizedTree = DiceASTReferenceSanitizer
 				.sanitize(condensedTree, enviroment);
diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTPragma.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTPragma.java
index 67b0adc..4bde0c2 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTPragma.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceASTPragma.java
@@ -2,11 +2,12 @@ package bjc.dicelang.examples;
 
 import java.util.function.BiConsumer;
 
-import bjc.dicelang.ast.nodes.IDiceASTNode;
 import bjc.utils.funcdata.FunctionalStringTokenizer;
 import bjc.utils.funcdata.IFunctionalMap;
 import bjc.utils.funcdata.ITree;
 
+import bjc.dicelang.ast.nodes.IDiceASTNode;
+
 /**
  * Alias for the type of a 'pragma' or special language command
  * 
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 4524fa0..b281fd8 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceExpressionPreparer.java
@@ -48,8 +48,8 @@ public class DiceExpressionPreparer {
 	}
 
 	static IFunctionalList<String> prepareCommand(String currentLine) {
-		IFunctionalList<String> tokens =
-				FunctionalStringTokenizer.fromString(currentLine).toList();
+		IFunctionalList<String> tokens = FunctionalStringTokenizer
+				.fromString(currentLine).toList();
 
 		Deque<IPair<String, String>> ops = new LinkedList<>();
 
@@ -60,8 +60,8 @@ public class DiceExpressionPreparer {
 		ops.add(new Pair<>(":=", ":="));
 		ops.add(new Pair<>("=>", "=>"));
 
-		IFunctionalList<String> semiExpandedTokens =
-				ListUtils.splitTokens(tokens, ops);
+		IFunctionalList<String> semiExpandedTokens = ListUtils
+				.splitTokens(tokens, ops);
 
 		ops = new LinkedList<>();
 
@@ -70,8 +70,8 @@ public class DiceExpressionPreparer {
 		ops.add(new Pair<>("[", "\\["));
 		ops.add(new Pair<>("]", "\\]"));
 
-		IFunctionalList<String> fullyExpandedTokens =
-				ListUtils.deAffixTokens(semiExpandedTokens, ops);
+		IFunctionalList<String> fullyExpandedTokens = ListUtils
+				.deAffixTokens(semiExpandedTokens, ops);
 
 		fullyExpandedTokens.removeIf((strang) -> strang.equals(""));
 
diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageState.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageState.java
index 0fb6a0f..fbb103f 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageState.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageState.java
@@ -2,9 +2,10 @@ package bjc.dicelang.examples;
 
 import java.util.Map;
 
+import bjc.utils.data.Pair;
+
 import bjc.dicelang.DiceExpressionParser;
 import bjc.dicelang.IDiceExpression;
-import bjc.utils.data.Pair;
 
 /**
  * Internal state of dice language
diff --git a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java
index 8dfaceb..2a9a492 100644
--- a/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java
+++ b/dice-lang/src/examples/java/bjc/dicelang/examples/DiceLanguageTest.java
@@ -43,8 +43,8 @@ public class DiceLanguageTest {
 
 		int nRolls = Integer.parseInt(strangs[2]);
 
-		IDiceExpression dexp =
-				stat.merge((dep, env) -> env.get(strangs[1]));
+		IDiceExpression dexp = stat
+				.merge((dep, env) -> env.get(strangs[1]));
 
 		for (int i = 1; i <= nRolls; i++) {
 			int roll = dexp.roll();