Pacakge reorganization

8 files changed, 27 insertions, 26 deletions

diff --git a/dice-lang/src/bjc/dicelang/v2/Define.java b/dice-lang/src/bjc/dicelang/v2/Define.java
index 9a68a98..5af91ea 100644
--- a/dice-lang/src/bjc/dicelang/v2/Define.java
+++ b/dice-lang/src/bjc/dicelang/v2/Define.java
@@ -2,14 +2,14 @@ package bjc.dicelang.v2;
 
 import bjc.utils.data.CircularIterator;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+
 import java.util.Iterator;
 import java.util.function.UnaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-
 public class Define implements UnaryOperator<String> {
 	public static enum Type { LINE, TOKEN }
 
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceBox.java b/dice-lang/src/bjc/dicelang/v2/DiceBox.java
index ae0481e..361b766 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceBox.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceBox.java
@@ -105,7 +105,7 @@ public class DiceBox {
 		}
 
 		public boolean canOptimize() {
-			if(diceSize.canOptimize() && (diceSize.optimize() <= 1) {
+			if(diceSize.canOptimize() && (diceSize.optimize() <= 1)) {
 				return numDice.canOptimize();
 			} else return false;
 		}
@@ -454,7 +454,7 @@ public class DiceBox {
 		if(!isValidExpression(exp)) return null;
 
 		if(scalarDiePattern.matcher(exp).matches()) {
-			Die scal = new ScalarDie(Long.parseLong(exp.substring(0, exp.indexOf('s'))))
+			Die scal = new ScalarDie(Long.parseLong(exp.substring(0, exp.indexOf('s'))));
 
 			return new DieExpression(scal);
 		} else if(simpleDiePattern.matcher(exp).matches()) {
@@ -462,7 +462,7 @@ public class DiceBox {
 
 			long right = Long.parseLong(dieParts[1]);
 			if(dieParts[0].equals("")) {
-				Die scal = new SimpleDie(1, right)
+				Die scal = new SimpleDie(1, right);
 				return new DieExpression(scal);
 			} else {
 				Die scal = new SimpleDie(Long.parseLong(dieParts[0]), right);
@@ -485,7 +485,7 @@ public class DiceBox {
 			DieExpression   left  = parseExpression(dieParts[0]);
 			Predicate<Long> right = deriveCond(dieParts[1]);
 
-			Die scal = new CompoundingDie(left.scalar, right, dieParts[1])
+			Die scal = new CompoundingDie(left.scalar, right, dieParts[1]);
 			return new DieExpression(scal);
 		} else if(explodingDiePattern.matcher(exp).matches()) {
 			String[] dieParts = exp.split("!");
@@ -510,7 +510,7 @@ public class DiceBox {
 			DieExpression right = parseExpression(dieParts[1]);
 			
 			DieList lst = new SimpleDieList(left.scalar, right.scalar);
-			return new DieExpression();
+			return new DieExpression(lst);
 		}
 
 		// @TODO give a specific error message
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java b/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java
index 9d69704..7f3c85b 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java
@@ -1,5 +1,7 @@
 package bjc.dicelang.v2;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.LinkedList;
@@ -9,8 +11,6 @@ import java.util.regex.Pattern;
 import jline.ConsoleReader;
 import jline.Terminal;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-
 public class DiceLangConsole {
 	private int commandNumber;
 
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
index 0798988..8ff20ef 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
@@ -11,6 +11,9 @@ import bjc.utils.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
 import bjc.utils.funcutils.StringUtils;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.v2.Token.Type.*;
+
 import java.util.Comparator;
 import java.util.Deque;
 import java.util.Iterator;
@@ -19,9 +22,6 @@ import java.util.LinkedList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.Token.Type.*;
-
 public class DiceLangEngine {
 	// Input rules for processing tokens
 	private List<IPair<String, String>> opExpansionList;
diff --git a/dice-lang/src/bjc/dicelang/v2/Evaluator.java b/dice-lang/src/bjc/dicelang/v2/Evaluator.java
index 904c8bc..047e12f 100644
--- a/dice-lang/src/bjc/dicelang/v2/Evaluator.java
+++ b/dice-lang/src/bjc/dicelang/v2/Evaluator.java
@@ -6,14 +6,14 @@ import bjc.utils.data.Tree;
 import bjc.utils.data.TopDownTransformIterator;
 import bjc.utils.data.TopDownTransformResult;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.v2.EvaluatorResult.Type.*;
+
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.function.Consumer;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.EvaluatorResult.Type.*;
-
 public class Evaluator {
 	private static enum CoerceSteps {
 		INTEGER, FLOAT;
@@ -128,12 +128,12 @@ public class Evaluator {
 						Iterator<ITree<Node>> nd = stepDebug(child);
 
 						for(; nd.hasNext(); nChild = nd.next()) {
-							ctx.thunk.accept(new SingleIterator(child));
+							ctx.thunk.accept(new SingleIterator<>(child));
 						}
 					} else {
 						nChild = new Tree<>(new Node(Node.Type.RESULT, evaluate(child)));
 
-						if(nChild != null) ctx.thunk.accept(new SingleIterator(nChild));
+						if(nChild != null) ctx.thunk.accept(new SingleIterator<>(nChild));
 					}
 
 					Node childNode      = nChild.getHead();
diff --git a/dice-lang/src/bjc/dicelang/v2/Parser.java b/dice-lang/src/bjc/dicelang/v2/Parser.java
index c939a8b..a47707d 100644
--- a/dice-lang/src/bjc/dicelang/v2/Parser.java
+++ b/dice-lang/src/bjc/dicelang/v2/Parser.java
@@ -1,5 +1,9 @@
 package bjc.dicelang.v2;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.v2.Node.Type.*;
+import static bjc.dicelang.v2.Token.Type.*;
+
 import java.util.Deque;
 import java.util.LinkedList;
 
@@ -7,10 +11,6 @@ import bjc.utils.data.ITree;
 import bjc.utils.data.Tree;
 import bjc.utils.funcdata.IList;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.Node.Type.*;
-import static bjc.dicelang.v2.Token.Type.*;
-
 public class Parser {
 	public Parser() {
 
diff --git a/dice-lang/src/bjc/dicelang/v2/Shunter.java b/dice-lang/src/bjc/dicelang/v2/Shunter.java
index d5f9135..41bc388 100644
--- a/dice-lang/src/bjc/dicelang/v2/Shunter.java
+++ b/dice-lang/src/bjc/dicelang/v2/Shunter.java
@@ -5,14 +5,14 @@ import bjc.utils.funcdata.FunctionalMap;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 
+import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.v2.Token.Type.*;
+
 import java.util.Deque;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Set;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.Token.Type.*;
-
 public class Shunter {
 	// The binary operators and their
 	// priorities
diff --git a/dice-lang/src/bjc/dicelang/v2/StreamEngine.java b/dice-lang/src/bjc/dicelang/v2/StreamEngine.java
index 41f01a7..cd43e92 100644
--- a/dice-lang/src/bjc/dicelang/v2/StreamEngine.java
+++ b/dice-lang/src/bjc/dicelang/v2/StreamEngine.java
@@ -3,11 +3,12 @@ package bjc.dicelang.v2;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcutils.ListUtils;
-import bjc.utils.esodata.SingleTape;
-import bjc.utils.esodata.Tape;
 
 import static bjc.dicelang.v2.Errors.ErrorKey.*;
 
+import bjc.utils.esodata.SingleTape;
+import bjc.utils.esodata.Tape;
+
 public class StreamEngine {
 	private DiceLangEngine eng;