1 files changed, 6 insertions, 6 deletions

diff --git a/base/src/bjc/dicelang/Tokenizer.java b/base/src/bjc/dicelang/Tokenizer.java
index 6b94e4e..7aed861 100644
--- a/base/src/bjc/dicelang/Tokenizer.java
+++ b/base/src/bjc/dicelang/Tokenizer.java
@@ -8,7 +8,7 @@ import bjc.dicelang.tokens.DiceToken;
 import bjc.dicelang.tokens.FloatToken;
 import bjc.dicelang.tokens.Token;
 import bjc.funcdata.FunctionalMap;
-import bjc.funcdata.IMap;
+import bjc.funcdata.MapEx;
 import bjc.utils.funcutils.StringUtils;
 import bjc.utils.parserutils.TokenUtils;
 
@@ -20,7 +20,7 @@ import static bjc.dicelang.tokens.Token.Type.*;
  */
 public class Tokenizer {
 	/* Literal tokens for tokenization */
-	private static final IMap<String, Token.Type> litTokens;
+	private static final MapEx<String, Token.Type> litTokens;
 
 	private final DiceLangEngine eng;
 
@@ -67,7 +67,7 @@ public class Tokenizer {
 	 * 
 	 * @return A lexed token.
 	 */
-	public Token lexToken(final String token, final IMap<String, String> stringLts) {
+	public Token lexToken(final String token, final MapEx<String, String> stringLts) {
 		if (token.equals("")) {
 			return null;
 		}
@@ -75,7 +75,7 @@ public class Tokenizer {
 		Token tk = Token.NIL_TOKEN;
 
 		if (litTokens.containsKey(token)) {
-			tk = new Token(litTokens.get(token));
+			tk = new Token(litTokens.get(token).get());
 		} else {
 			switch (token.charAt(0)) {
 			case '(':
@@ -139,7 +139,7 @@ public class Tokenizer {
 	private final Pattern stringLitMatcher = Pattern.compile("\\AstringLiteral(\\d+)\\Z");
 
 	/* Tokenize a literal value. */
-	private Token tokenizeLiteral(final String rtoken, final IMap<String, String> stringLts) {
+	private Token tokenizeLiteral(final String rtoken, final MapEx<String, String> stringLts) {
 		Token tk = Token.NIL_TOKEN;
 
 		String token = rtoken.trim();
@@ -175,7 +175,7 @@ public class Tokenizer {
 			if (stringLit.matches()) {
 				final int litNum = Integer.parseInt(stringLit.group(1));
 
-				eng.addStringLiteral(litNum, stringLts.get(token));
+				eng.addStringLiteral(litNum, stringLts.get(token).get());
 				tk = new Token(STRING_LIT, litNum);
 			} else {
 				/* Everything else is a symbol */