Update to BJC-Utils changes

3 files changed, 11 insertions, 11 deletions

diff --git a/dice-lang/src/bjc/dicelang/CompilerTweaker.java b/dice-lang/src/bjc/dicelang/CompilerTweaker.java
index 41f0c10..e04f054 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.parserutils.TokenSplitter;

+import bjc.utils.parserutils.splitter.SimpleTokenSplitter;

 

 /**

  * Contains methods for customizing the DiceLang and SCL compilers.

@@ -12,7 +12,7 @@ public class CompilerTweaker {
 	 * Bits of the compiler necessary

 	 */

 	private DiceLangEngine		eng;

-	private TokenSplitter	opExpander;

+	private SimpleTokenSplitter	opExpander;

 

 	public CompilerTweaker(DiceLangEngine eng) {

 		this.eng = eng;

@@ -88,7 +88,7 @@ public class CompilerTweaker {
 	 * @param times

 	 *                The number of times to allow defines to recur.

 	 */

-	public void setDefineRecurLimit(int times) {

+	public static void setDefineRecurLimit(int times) {

 		Define.MAX_RECURS = times;

 	}

 }

diff --git a/dice-lang/src/bjc/dicelang/DiceLangEngine.java b/dice-lang/src/bjc/dicelang/DiceLangEngine.java
index 85ab77a..dfd14d5 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.parserutils.TokenSplitter;
 import bjc.utils.parserutils.TokenUtils;
+import bjc.utils.parserutils.splitter.SimpleTokenSplitter;
 
 import java.util.Deque;
 import java.util.Iterator;
@@ -37,7 +37,7 @@ public class DiceLangEngine {
 	/*
 	 * Split tokens around operators with regex
 	 */
-	TokenSplitter opExpander;
+	SimpleTokenSplitter opExpander;
 
 	/*
 	 * ID for generation.
@@ -120,7 +120,7 @@ public class DiceLangEngine {
 		/*
 		 * Initialize operator expansion list.
 		 */
-		opExpander = new TokenSplitter();
+		opExpander = new SimpleTokenSplitter();
 		opExpander.addMultiDelimiter("\\(");
 		opExpander.addMultiDelimiter("\\)");
 		opExpander.addMultiDelimiter("\\[");
@@ -475,7 +475,7 @@ public class DiceLangEngine {
 			/*
 			 * Print the string table if it exists.
 			 */
-			if(stringLiterals.getSize() > 0) {
+			if(stringLiterals.size() > 0) {
 				System.out.println("\tString literals in table");
 
 				stringLiterals.forEach((key, val) -> {
diff --git a/dice-lang/src/bjc/dicelang/expr/Lexer.java b/dice-lang/src/bjc/dicelang/expr/Lexer.java
index 75267ad..7c15884 100644
--- a/dice-lang/src/bjc/dicelang/expr/Lexer.java
+++ b/dice-lang/src/bjc/dicelang/expr/Lexer.java
@@ -1,10 +1,10 @@
 package bjc.dicelang.expr;
 
-import bjc.utils.parserutils.TokenSplitter;
-
 import java.util.LinkedList;
 import java.util.List;
 
+import bjc.utils.parserutils.splitter.SimpleTokenSplitter;
+
 /**
  * Implements the lexer for simple expression operations.
  *
@@ -14,13 +14,13 @@ public class Lexer {
 	/*
 	 * Spliter we use
 	 */
-	private TokenSplitter split;
+	private SimpleTokenSplitter split;
 
 	/**
 	 * Create a new expression lexer.
 	 */
 	public Lexer() {
-		split = new TokenSplitter();
+		split = new SimpleTokenSplitter();
 
 		split.addDelimiter("(", ")");
 		split.addDelimiter("+", "-", "*", "/");