From 0fa4f162f4e42a455dbb7e7459854b9467337863 Mon Sep 17 00:00:00 2001
From: bculkin2442 <bjculkin@mix.wvu.edu>
Date: Fri, 22 Apr 2016 14:48:25 -0400
Subject: Formatting changes

---
 .../main/java/bjc/dicelang/ast/DiceASTParser.java  | 102 ++++++++++-----------
 1 file changed, 51 insertions(+), 51 deletions(-)

(limited to 'dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java')

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 3a4bccf..f14df74 100644
--- a/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java
+++ b/dice-lang/src/main/java/bjc/dicelang/ast/DiceASTParser.java
@@ -30,6 +30,41 @@ import bjc.dicelang.ast.nodes.VariableDiceNode;
  *
  */
 public class DiceASTParser {
+	private static IDiceASTNode convertLeafNode(String leafNode) {
+		DiceLiteralType literalType = ILiteralDiceNode
+				.getLiteralType(leafNode);
+
+		if (literalType != null) {
+			switch (literalType) {
+				case DICE:
+					return new DiceLiteralNode(
+							IDiceExpression.toExpression(leafNode));
+				case INTEGER:
+					return new IntegerLiteralNode(
+							Integer.parseInt(leafNode));
+				default:
+					throw new InputMismatchException(
+							"Cannot convert string '" + leafNode
+									+ "' into a literal.");
+			}
+		}
+
+		return new VariableDiceNode(leafNode);
+	}
+
+	private static IDiceASTNode convertOperatorNode(String operatorNode) {
+		try {
+			return OperatorDiceNode.fromString(operatorNode);
+		} catch (IllegalArgumentException iaex) {
+			InputMismatchException imex = new InputMismatchException(
+					"Attempted to parse invalid operator " + operatorNode);
+
+			imex.initCause(iaex);
+
+			throw imex;
+		}
+	}
+
 	/**
 	 * Create an AST from a list of tokens
 	 * 
@@ -73,30 +108,6 @@ public class DiceASTParser {
 		return tokenizedTree;
 	}
 
-	private static ITree<String> parseCloseArray(
-			Deque<ITree<String>> queuedTrees) {
-		IFunctionalList<ITree<String>> children = new FunctionalList<>();
-
-		while (shouldContinuePopping(queuedTrees)) {
-			children.add(queuedTrees.pop());
-		}
-
-		queuedTrees.pop();
-
-		children.reverse();
-
-		ITree<String> arrayTree = new Tree<>("[]", children);
-
-		return arrayTree;
-	}
-
-	private static boolean shouldContinuePopping(
-			Deque<ITree<String>> queuedTrees) {
-		String peekToken = queuedTrees.peek().getHead();
-
-		return !peekToken.equals("[");
-	}
-
 	private static boolean isOperatorNode(String token) {
 		if (StringUtils.containsOnly(token, "\\[")) {
 			return true;
@@ -118,38 +129,27 @@ public class DiceASTParser {
 		}
 	}
 
-	private static IDiceASTNode convertLeafNode(String leafNode) {
-		DiceLiteralType literalType = ILiteralDiceNode
-				.getLiteralType(leafNode);
+	private static ITree<String> parseCloseArray(
+			Deque<ITree<String>> queuedTrees) {
+		IFunctionalList<ITree<String>> children = new FunctionalList<>();
 
-		if (literalType != null) {
-			switch (literalType) {
-				case DICE:
-					return new DiceLiteralNode(
-							IDiceExpression.toExpression(leafNode));
-				case INTEGER:
-					return new IntegerLiteralNode(
-							Integer.parseInt(leafNode));
-				default:
-					throw new InputMismatchException(
-							"Cannot convert string '" + leafNode
-									+ "' into a literal.");
-			}
+		while (shouldContinuePopping(queuedTrees)) {
+			children.add(queuedTrees.pop());
 		}
 
-		return new VariableDiceNode(leafNode);
-	}
+		queuedTrees.pop();
 
-	private static IDiceASTNode convertOperatorNode(String operatorNode) {
-		try {
-			return OperatorDiceNode.fromString(operatorNode);
-		} catch (IllegalArgumentException iaex) {
-			InputMismatchException imex = new InputMismatchException(
-					"Attempted to parse invalid operator " + operatorNode);
+		children.reverse();
 
-			imex.initCause(iaex);
+		ITree<String> arrayTree = new Tree<>("[]", children);
 
-			throw imex;
-		}
+		return arrayTree;
+	}
+
+	private static boolean shouldContinuePopping(
+			Deque<ITree<String>> queuedTrees) {
+		String peekToken = queuedTrees.peek().getHead();
+
+		return !peekToken.equals("[");
 	}
 }
-- 
cgit v1.2.3