From 94913a2fccff9e80f84ac477c2020bd7c7b1833a Mon Sep 17 00:00:00 2001 From: bjculkin Date: Fri, 17 Mar 2017 08:36:10 -0400 Subject: Adjust code to refactoring in BJC-Utils. I moved some stuff around in BJC-Utils, so this adjusts for it. --- dice-lang/src/bjc/dicelang/Tokenizer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'dice-lang/src/bjc/dicelang/Tokenizer.java') 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 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)); -- cgit v1.2.3