From bfa7c67f491d8f693308e6299266f527b49be600 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Wed, 27 Jul 2016 16:31:36 -0400
Subject: Formatting pass

---
 .../main/java/bjc/dicelang/DiceExpressionParser.java    |  3 +--
 .../main/java/bjc/dicelang/ast/ArithmeticCollapser.java |  9 ++++-----
 .../src/main/java/bjc/dicelang/ast/DiceASTInliner.java  |  6 ++----
 .../src/main/java/bjc/dicelang/ast/DiceASTParser.java   | 17 ++++++++---------
 4 files changed, 15 insertions(+), 20 deletions(-)

(limited to 'dice-lang/src/main/java/bjc')

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