From 572551b78e7f36b65185cb258bea31114d9992f6 Mon Sep 17 00:00:00 2001 From: bjculkin Date: Mon, 27 Mar 2017 10:51:28 -0400 Subject: Simplifications --- .../main/java/bjc/utils/parserutils/pratt/tokens/StringToken.java | 4 ++++ .../bjc/utils/parserutils/pratt/tokens/StringTokenStream.java | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens') diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens/StringToken.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens/StringToken.java index 7e779aa..f156f02 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens/StringToken.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens/StringToken.java @@ -77,4 +77,8 @@ public class StringToken implements Token { public String toString() { return String.format("StringToken [key='%s', val='%s']", key, val); } + + public static StringToken litToken(String val) { + return new StringToken(val, val); + } } diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens/StringTokenStream.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens/StringTokenStream.java index d7d4a66..75e86c4 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens/StringTokenStream.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/pratt/tokens/StringTokenStream.java @@ -5,11 +5,13 @@ import java.util.Iterator; import bjc.utils.parserutils.pratt.Token; import bjc.utils.parserutils.pratt.TokenStream; +import static bjc.utils.parserutils.pratt.tokens.StringToken.litToken; + /** * Simple implementation of token stream for strings. * - * The terminal token here is represented by a token with type '(end)' and null - * value. + * The terminal token here is represented by a token with type and value + * '(end)'. * * @author EVE * @@ -41,7 +43,7 @@ public class StringTokenStream extends TokenStream { if (iter.hasNext()) { curr = iter.next(); } else { - curr = new StringToken("(end)", null); + curr = litToken("(end)"); } return curr; -- cgit v1.2.3