Package reorganization

25 files changed, 48 insertions, 48 deletions

diff --git a/dice-lang/src/bjc/dicelang/v2/Define.java b/dice-lang/src/bjc/dicelang/Define.java
index 5af91ea..2967af6 100644
--- a/dice-lang/src/bjc/dicelang/v2/Define.java
+++ b/dice-lang/src/bjc/dicelang/Define.java
@@ -1,8 +1,8 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
 import bjc.utils.data.CircularIterator;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.Errors.ErrorKey.*;
 
 import java.util.Iterator;
 import java.util.function.UnaryOperator;
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java b/dice-lang/src/bjc/dicelang/DiceLangConsole.java
index 7f3c85b..d9d9288 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangConsole.java
+++ b/dice-lang/src/bjc/dicelang/DiceLangConsole.java
@@ -1,6 +1,6 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.Errors.ErrorKey.*;
 
 import java.io.IOException;
 import java.util.List;
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
index 8a877af..195c98a 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
 import bjc.utils.data.IPair;
 import bjc.utils.data.ITree;
@@ -10,8 +10,8 @@ import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.Token.Type.*;
+import static bjc.dicelang.Errors.ErrorKey.*;
+import static bjc.dicelang.Token.Type.*;
 
 import java.util.Comparator;
 import java.util.Deque;
diff --git a/dice-lang/src/bjc/dicelang/v2/DoubleMatcher.java b/dice-lang/src/bjc/dicelang/DoubleMatcher.java
index 5f6f0db..75df9c7 100644
--- a/dice-lang/src/bjc/dicelang/v2/DoubleMatcher.java
+++ b/dice-lang/src/bjc/dicelang/DoubleMatcher.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
 import java.util.regex.Pattern;
 
diff --git a/dice-lang/src/bjc/dicelang/v2/Errors.java b/dice-lang/src/bjc/dicelang/Errors.java
index 6ad74ab..e6a825c 100644
--- a/dice-lang/src/bjc/dicelang/v2/Errors.java
+++ b/dice-lang/src/bjc/dicelang/Errors.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
 public class Errors {
 	public static enum ErrorKey {
diff --git a/dice-lang/src/bjc/dicelang/v2/Evaluator.java b/dice-lang/src/bjc/dicelang/Evaluator.java
index ed9db17..7b9bc83 100644
--- a/dice-lang/src/bjc/dicelang/v2/Evaluator.java
+++ b/dice-lang/src/bjc/dicelang/Evaluator.java
@@ -1,17 +1,17 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
-import bjc.dicelang.v2.dice.CompoundDie;
-import bjc.dicelang.v2.dice.MathDie;
-import bjc.dicelang.v2.dice.SimpleDie;
-import bjc.dicelang.v2.dice.SimpleDieList;
+import bjc.dicelang.dice.CompoundDie;
+import bjc.dicelang.dice.MathDie;
+import bjc.dicelang.dice.SimpleDie;
+import bjc.dicelang.dice.SimpleDieList;
 import bjc.utils.data.ITree;
 import bjc.utils.data.SingleIterator;
 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 static bjc.dicelang.Errors.ErrorKey.*;
+import static bjc.dicelang.EvaluatorResult.Type.*;
 
 import java.util.Deque;
 import java.util.Iterator;
diff --git a/dice-lang/src/bjc/dicelang/v2/EvaluatorResult.java b/dice-lang/src/bjc/dicelang/EvaluatorResult.java
index bac4d2d..ef70d3d 100644
--- a/dice-lang/src/bjc/dicelang/v2/EvaluatorResult.java
+++ b/dice-lang/src/bjc/dicelang/EvaluatorResult.java
@@ -1,8 +1,8 @@
-package bjc.dicelang.v2;

+package bjc.dicelang;

 

-import bjc.dicelang.v2.dice.Die;

-import bjc.dicelang.v2.dice.DieExpression;

-import bjc.dicelang.v2.dice.DieList;

+import bjc.dicelang.dice.Die;

+import bjc.dicelang.dice.DieExpression;

+import bjc.dicelang.dice.DieList;

 import bjc.utils.data.ITree;

 import bjc.utils.data.Tree;

 

diff --git a/dice-lang/src/bjc/dicelang/v2/Node.java b/dice-lang/src/bjc/dicelang/Node.java
index 334a9f3..3ae54e3 100644
--- a/dice-lang/src/bjc/dicelang/v2/Node.java
+++ b/dice-lang/src/bjc/dicelang/Node.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
 public class Node {
 	public static enum Type {
diff --git a/dice-lang/src/bjc/dicelang/v2/Parser.java b/dice-lang/src/bjc/dicelang/Parser.java
index a47707d..4733ced 100644
--- a/dice-lang/src/bjc/dicelang/v2/Parser.java
+++ b/dice-lang/src/bjc/dicelang/Parser.java
@@ -1,8 +1,8 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-import static bjc.dicelang.v2.Node.Type.*;
-import static bjc.dicelang.v2.Token.Type.*;
+import static bjc.dicelang.Errors.ErrorKey.*;
+import static bjc.dicelang.Node.Type.*;
+import static bjc.dicelang.Token.Type.*;
 
 import java.util.Deque;
 import java.util.LinkedList;
diff --git a/dice-lang/src/bjc/dicelang/v2/Shunter.java b/dice-lang/src/bjc/dicelang/Shunter.java
index 28dafef..38f49be 100644
--- a/dice-lang/src/bjc/dicelang/v2/Shunter.java
+++ b/dice-lang/src/bjc/dicelang/Shunter.java
@@ -1,12 +1,12 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
 import bjc.utils.funcdata.FunctionalList;
 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 static bjc.dicelang.Errors.ErrorKey.*;
+import static bjc.dicelang.Token.Type.*;
 
 import java.util.Deque;
 import java.util.HashSet;
diff --git a/dice-lang/src/bjc/dicelang/v2/StreamEngine.java b/dice-lang/src/bjc/dicelang/StreamEngine.java
index cd43e92..2971392 100644
--- a/dice-lang/src/bjc/dicelang/v2/StreamEngine.java
+++ b/dice-lang/src/bjc/dicelang/StreamEngine.java
@@ -1,10 +1,10 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcutils.ListUtils;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
+import static bjc.dicelang.Errors.ErrorKey.*;
 
 import bjc.utils.esodata.SingleTape;
 import bjc.utils.esodata.Tape;
diff --git a/dice-lang/src/bjc/dicelang/v2/Token.java b/dice-lang/src/bjc/dicelang/Token.java
index 3d8359f..c022fe1 100644
--- a/dice-lang/src/bjc/dicelang/v2/Token.java
+++ b/dice-lang/src/bjc/dicelang/Token.java
@@ -1,6 +1,6 @@
-package bjc.dicelang.v2;
+package bjc.dicelang;
 
-import bjc.dicelang.v2.dice.DieExpression;
+import bjc.dicelang.dice.DieExpression;
 import bjc.utils.funcdata.IList;
 
 /**
diff --git a/dice-lang/src/bjc/dicelang/v2/Tokenizer.java b/dice-lang/src/bjc/dicelang/Tokenizer.java
index 40b1285..532a6a4 100644
--- a/dice-lang/src/bjc/dicelang/v2/Tokenizer.java
+++ b/dice-lang/src/bjc/dicelang/Tokenizer.java
@@ -1,12 +1,12 @@
-package bjc.dicelang.v2;

+package bjc.dicelang;

 

-import static bjc.dicelang.v2.Errors.ErrorKey.*;

-import static bjc.dicelang.v2.Token.Type.*;

+import static bjc.dicelang.Errors.ErrorKey.*;

+import static bjc.dicelang.Token.Type.*;

 

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

-import bjc.dicelang.v2.dice.DiceBox;

+import bjc.dicelang.dice.DiceBox;

 import bjc.utils.funcdata.FunctionalMap;

 import bjc.utils.funcdata.IMap;

 import bjc.utils.funcutils.StringUtils;

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/CompoundDie.java b/dice-lang/src/bjc/dicelang/dice/CompoundDie.java
index a8186eb..16aec76 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/CompoundDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/CompoundDie.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 public class CompoundDie implements Die {

 	private Die left;

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/CompoundingDie.java b/dice-lang/src/bjc/dicelang/dice/CompoundingDie.java
index d5991ae..9744650 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/CompoundingDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/CompoundingDie.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 import java.util.function.Predicate;

 

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/DiceBox.java b/dice-lang/src/bjc/dicelang/dice/DiceBox.java
index 995c3bf..4c0641a 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/DiceBox.java
+++ b/dice-lang/src/bjc/dicelang/dice/DiceBox.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;
+package bjc.dicelang.dice;
 
 import java.util.Random;
 import java.util.function.Predicate;
diff --git a/dice-lang/src/bjc/dicelang/v2/dice/Die.java b/dice-lang/src/bjc/dicelang/dice/Die.java
index 808d7fd..9f839ed 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/Die.java
+++ b/dice-lang/src/bjc/dicelang/dice/Die.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 public interface Die {

 	boolean canOptimize();

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/DieExpression.java b/dice-lang/src/bjc/dicelang/dice/DieExpression.java
index 93fcbb9..3bf121b 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/DieExpression.java
+++ b/dice-lang/src/bjc/dicelang/dice/DieExpression.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 import java.util.Arrays;

 

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/DieList.java b/dice-lang/src/bjc/dicelang/dice/DieList.java
index ab3c7b7..a55f2b9 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/DieList.java
+++ b/dice-lang/src/bjc/dicelang/dice/DieList.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 public interface DieList {

 	boolean canOptimize();

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/ExplodingDice.java b/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java
index 40ff1e0..6ab9902 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/ExplodingDice.java
+++ b/dice-lang/src/bjc/dicelang/dice/ExplodingDice.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 import java.util.LinkedList;

 import java.util.List;

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/FudgeDie.java b/dice-lang/src/bjc/dicelang/dice/FudgeDie.java
index 4c8c52a..ca4fb73 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/FudgeDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/FudgeDie.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 public class FudgeDie implements Die {

 	private Die numDice;

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/MathDie.java b/dice-lang/src/bjc/dicelang/dice/MathDie.java
index 55e01f8..7e9204d 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/MathDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/MathDie.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 public class MathDie implements Die {

 	public static enum MathOp {

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/ScalarDie.java b/dice-lang/src/bjc/dicelang/dice/ScalarDie.java
index 17714ee..ac64d1c 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/ScalarDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/ScalarDie.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 public class ScalarDie implements Die {

 	private long val;

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/SimpleDie.java b/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
index f084822..5ba76ef 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/SimpleDie.java
+++ b/dice-lang/src/bjc/dicelang/dice/SimpleDie.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 public class SimpleDie implements Die {

 	private Die numDice;

diff --git a/dice-lang/src/bjc/dicelang/v2/dice/SimpleDieList.java b/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java
index e5aef18..cca1f04 100644
--- a/dice-lang/src/bjc/dicelang/v2/dice/SimpleDieList.java
+++ b/dice-lang/src/bjc/dicelang/dice/SimpleDieList.java
@@ -1,4 +1,4 @@
-package bjc.dicelang.v2.dice;

+package bjc.dicelang.dice;

 

 public class SimpleDieList implements DieList {

 	private Die numDice;