6 files changed, 16 insertions, 15 deletions

diff --git a/dice-lang/src/bjc/dicelang/CompilerTweaker.java b/dice-lang/src/bjc/dicelang/CompilerTweaker.java
index ef965b5..41f0c10 100644
--- a/dice-lang/src/bjc/dicelang/CompilerTweaker.java
+++ b/dice-lang/src/bjc/dicelang/CompilerTweaker.java
@@ -1,6 +1,6 @@
 package bjc.dicelang;

 

-import bjc.utils.funcutils.TokenSplitter;

+import bjc.utils.parserutils.TokenSplitter;

 

 /**

  * Contains methods for customizing the DiceLang and SCL compilers.

diff --git a/dice-lang/src/bjc/dicelang/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
index 7d35c4c..85ab77a 100644
--- a/dice-lang/src/bjc/dicelang/DiceLangEngine.java
+++ b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
@@ -8,8 +8,8 @@ import bjc.utils.funcdata.FunctionalStringTokenizer;
 import bjc.utils.funcdata.IList;
 import bjc.utils.funcdata.IMap;
 import bjc.utils.funcutils.ListUtils;
-import bjc.utils.funcutils.TokenSplitter;
-import bjc.utils.funcutils.StringUtils;
+import bjc.utils.parserutils.TokenSplitter;
+import bjc.utils.parserutils.TokenUtils;
 
 import java.util.Deque;
 import java.util.Iterator;
@@ -439,7 +439,7 @@ public class DiceLangEngine {
 		/*
 		 * Remove string literals.
 		 */
-		List<String> destringedParts = StringUtils.removeDQuotedStrings(newComm);
+		List<String> destringedParts = TokenUtils.removeDQuotedStrings(newComm);
 		StringBuffer destringedCommand = new StringBuffer();
 
 		for(String part : destringedParts) {
@@ -457,7 +457,7 @@ public class DiceLangEngine {
 				 * Insert the string with its escape sequences
 				 * interpreted.
 				 */
-				stringLiterals.put(litName, StringUtils.descapeString(litVal));
+				stringLiterals.put(litName, TokenUtils.descapeString(litVal));
 				nextLiteral += 1;
 
 				/*
diff --git a/dice-lang/src/bjc/dicelang/Tokenizer.java b/dice-lang/src/bjc/dicelang/Tokenizer.java
index 7292d2c..2208f00 100644
--- a/dice-lang/src/bjc/dicelang/Tokenizer.java
+++ b/dice-lang/src/bjc/dicelang/Tokenizer.java
@@ -4,6 +4,7 @@ import bjc.dicelang.dice.DiceBox;
 import bjc.utils.funcdata.FunctionalMap;

 import bjc.utils.funcdata.IMap;

 import bjc.utils.funcutils.StringUtils;

+import bjc.utils.parserutils.TokenUtils;

 

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

@@ -108,7 +109,7 @@ public class Tokenizer {
 	private Token tokenizeLiteral(String token, IMap<String, String> stringLts) {

 		Token tk = Token.NIL_TOKEN;

 

-		if(StringUtils.isInt(token)) {

+		if(TokenUtils.isInt(token)) {

 			tk = new Token(INT_LIT, Long.parseLong(token));

 		} else if(hexadecimalMatcher.matcher(token).matches()) {

 			String newToken = token.substring(0, 1) + token.substring(token.indexOf('x'));

@@ -130,7 +131,7 @@ public class Tokenizer {
 				Errors.inst.printError(EK_TOK_INVFLEX, flexNum, Integer.toString(parseBase));

 				return Token.NIL_TOKEN;

 			}

-		} else if(StringUtils.isDouble(token)) {

+		} else if(TokenUtils.isDouble(token)) {

 			tk = new Token(FLOAT_LIT, Double.parseDouble(token));

 		} else if(DiceBox.isValidExpression(token)) {

 			tk = new Token(DICE_LIT, DiceBox.parseExpression(token));

diff --git a/dice-lang/src/bjc/dicelang/expr/Lexer.java b/dice-lang/src/bjc/dicelang/expr/Lexer.java
index cff1170..75267ad 100644
--- a/dice-lang/src/bjc/dicelang/expr/Lexer.java
+++ b/dice-lang/src/bjc/dicelang/expr/Lexer.java
@@ -1,6 +1,6 @@
 package bjc.dicelang.expr;
 
-import bjc.utils.funcutils.TokenSplitter;
+import bjc.utils.parserutils.TokenSplitter;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java b/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java
index 0da5364..c0a8d86 100644
--- a/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java
+++ b/dice-lang/src/bjc/dicelang/scl/StreamControlEngine.java
@@ -5,7 +5,7 @@ import bjc.utils.esodata.SimpleStack;
 import bjc.utils.esodata.Stack;
 import bjc.utils.funcdata.FunctionalList;
 import bjc.utils.funcdata.IList;
-import bjc.utils.funcutils.StringUtils;
+import bjc.utils.parserutils.TokenUtils;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -135,9 +135,9 @@ public class StreamControlEngine {
 				return new Token(BLIT, true);
 			else if(token.equals("false"))
 				return new Token(BLIT, false);
-			else if(StringUtils.isInt(token))
+			else if(TokenUtils.isInt(token))
 				return new Token(ILIT, Long.parseLong(token));
-			else if(StringUtils.isDouble(token))
+			else if(TokenUtils.isDouble(token))
 				return new Token(FLIT, Double.parseDouble(token));
 			else {
 				Errors.inst.printError(EK_SCL_INVTOKEN, token);
@@ -470,7 +470,7 @@ public class StreamControlEngine {
 		 */
 		n += 1;
 
-		curStack.push(new Token(SLIT, StringUtils.descapeString(sb.toString())));
+		curStack.push(new Token(SLIT, TokenUtils.descapeString(sb.toString())));
 
 		return n;
 	}
diff --git a/dice-lang/src/bjc/dicelang/v1/IDiceExpression.java b/dice-lang/src/bjc/dicelang/v1/IDiceExpression.java
index 5bf062b..9de7553 100644
--- a/dice-lang/src/bjc/dicelang/v1/IDiceExpression.java
+++ b/dice-lang/src/bjc/dicelang/v1/IDiceExpression.java
@@ -1,6 +1,6 @@
 package bjc.dicelang.v1;
 
-import bjc.utils.funcutils.StringUtils;
+import bjc.utils.parserutils.TokenUtils;
 
 /**
  * An expression for something that can be rolled like a polyhedral die
@@ -35,12 +35,12 @@ public interface IDiceExpression {
 
 		String diceMatcher = "\\Ad\\d+\\Z";
 
-		if(StringUtils.containsInfixOperator(literalData, "c")) {
+		if(TokenUtils.containsInfixOperator(literalData, "c")) {
 			// Parse a compound die
 			String[] strangs = literalData.split("c");
 
 			return new CompoundDice(strangs);
-		} else if(StringUtils.containsInfixOperator(literalData, "d"))
+		} else if(TokenUtils.containsInfixOperator(literalData, "d"))
 			// Handle groups of similiar dice
 			return ComplexDice.fromString(literalData);
 		else if(literalData.matches(diceMatcher))