From 5115f1d2a7eab41436debc696870953e18a1b236 Mon Sep 17 00:00:00 2001 From: student Date: Mon, 12 Feb 2018 13:56:22 -0500 Subject: General update --- base/src/bjc/dicelang/expr/Lexer.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'base/src/bjc/dicelang/expr/Lexer.java') diff --git a/base/src/bjc/dicelang/expr/Lexer.java b/base/src/bjc/dicelang/expr/Lexer.java index 0b95cb8..7530ba5 100644 --- a/base/src/bjc/dicelang/expr/Lexer.java +++ b/base/src/bjc/dicelang/expr/Lexer.java @@ -26,7 +26,9 @@ public class Lexer { split = new ConfigurableTokenSplitter(true); split.addSimpleDelimiters("(", ")"); - split.addSimpleDelimiters("+", "-", "*", "/"); + + split.addSimpleDelimiters("+", "-"); + split.addSimpleDelimiters("*", "/"); } /** @@ -50,8 +52,11 @@ public class Lexer { for (final String spacedToken : spacedTokens) { /* Split on operators. */ final IList splitTokens = split.split(spacedToken); + /* Convert strings to tokens. */ - final IList rawTokens = splitTokens.map(tok -> tks.lexToken(tok, spacedToken)); + final IList rawTokens = splitTokens.map(tok -> { + return tks.lexToken(tok, spacedToken); + }); /* Add tokens to results. */ rawTokens.forEach(tokens::add); -- cgit v1.2.3