Update

6 files changed, 2 insertions, 15 deletions

diff --git a/dice-lang/src/bjc/dicelang/v2/Define.java b/dice-lang/src/bjc/dicelang/v2/Define.java
index 3ee2f37..f87bab6 100644
--- a/dice-lang/src/bjc/dicelang/v2/Define.java
+++ b/dice-lang/src/bjc/dicelang/v2/Define.java
@@ -119,7 +119,7 @@ public class Define implements UnaryOperator<String> {
 				} else {
 					String replac = replacers.next();
 
-					searcherMatcher.appendReplacement(sb, replacers.next());
+					searcherMatcher.appendReplacement(sb, replac);
 				}
 			}
 			
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceBox.java b/dice-lang/src/bjc/dicelang/v2/DiceBox.java
index 8297e24..2a32f47 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceBox.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceBox.java
@@ -7,8 +7,6 @@ import java.util.Random;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-
 public class DiceBox {
 	private static final Random rng = new Random();
 
diff --git a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
index 220fd3f..ad56cc1 100644
--- a/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/v2/DiceLangEngine.java
@@ -3,7 +3,6 @@ package bjc.dicelang.v2;
 import bjc.utils.data.IPair;
 import bjc.utils.data.ITree;
 import bjc.utils.data.Pair;
-import bjc.utils.data.Tree;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.FunctionalMap;
 import bjc.utils.funcdata.FunctionalStringTokenizer;
@@ -12,7 +11,6 @@ import bjc.utils.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
 import bjc.utils.funcutils.StringUtils;
 
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Deque;
 import java.util.Iterator;
@@ -66,10 +64,6 @@ public class DiceLangEngine {
 	// Stream engine for processing streams
 	private StreamEngine streamEng;
 
-	private final int MATH_PREC = 20;
-	private final int DICE_PREC = 10;
-	private final int EXPR_PREC = 0;
-
 	public DiceLangEngine() {
 		lineDefns   = new FunctionalList<>();
 		tokenDefns  = new FunctionalList<>();
@@ -576,7 +570,6 @@ public class DiceLangEngine {
 		for(IPair<String, String> op : deaffixTokens) {
 			Deque<String> newWorking = new LinkedList<>();
 			
-			String opName  = op.getLeft();
 			String opRegex = op.getRight();
 
 			Pattern opRegexPattern  = Pattern.compile(opRegex);
diff --git a/dice-lang/src/bjc/dicelang/v2/Errors.java b/dice-lang/src/bjc/dicelang/v2/Errors.java
index 4ba0aca..a533438 100644
--- a/dice-lang/src/bjc/dicelang/v2/Errors.java
+++ b/dice-lang/src/bjc/dicelang/v2/Errors.java
@@ -1,7 +1,5 @@
 package bjc.dicelang.v2;
 
-import static bjc.dicelang.v2.Errors.ErrorKey.*;
-
 public class Errors {
 	public static enum ErrorKey {
 		// Define Errors
diff --git a/dice-lang/src/bjc/dicelang/v2/Evaluator.java b/dice-lang/src/bjc/dicelang/v2/Evaluator.java
index 969b2d5..c13e42d 100644
--- a/dice-lang/src/bjc/dicelang/v2/Evaluator.java
+++ b/dice-lang/src/bjc/dicelang/v2/Evaluator.java
@@ -191,7 +191,7 @@ public class Evaluator {
 			case COERCE:
 				if(ast.getChildrenCount() != 1) {
 					Errors.inst.printError(EK_EVAL_NOTUNARY, ast.getChildrenCount());
-					return new Tree<>(FAIL(AST));
+					return new Tree<>(FAIL(ast));
 				}
 				break;
 			default:
diff --git a/dice-lang/src/bjc/dicelang/v2/Shunter.java b/dice-lang/src/bjc/dicelang/v2/Shunter.java
index 37da14c..e95b642 100644
--- a/dice-lang/src/bjc/dicelang/v2/Shunter.java
+++ b/dice-lang/src/bjc/dicelang/v2/Shunter.java
@@ -86,8 +86,6 @@ public class Shunter {
 		Deque<Token> currReturned = new LinkedList<>();
 
 		for(Token tk : tks.toIterable()) {
-			Token.Type tkType = tk.type;
-
 			if(unaryMode) {
 				if(isUnary(tk)) {
 					unaryOps.add(tk);