From 1b8704ee52801aca190f89c6839098a9b0776e7c Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Mon, 13 Feb 2017 02:57:12 -0500 Subject: Update --- .../main/java/bjc/utils/funcutils/TokenSplitter.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc') diff --git a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java index e2d59d3..f04b68d 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java +++ b/BJC-Utils2/src/main/java/bjc/utils/funcutils/TokenSplitter.java @@ -1,5 +1,6 @@ package bjc.utils.funcutils; +import java.util.Iterator; import java.util.function.BiFunction; import bjc.utils.funcdata.FunctionalList; @@ -28,26 +29,25 @@ final class TokenSplitter return new FunctionalList<>(tokenToSplit); } - IList splitTokens = new FunctionalList<>( - tokenToSplit.split(operatorRegex)); - + IList splitTokens = new FunctionalList<>(tokenToSplit.split(operatorRegex)); IList result = new FunctionalList<>(); + Iterator itr = splitTokens.toIterable().iterator(); int tokenExpansionSize = splitTokens.getSize(); - splitTokens.forEachIndexed((tokenIndex, token) -> { + String elm = itr.next(); + + for(int i = 0; itr.hasNext(); elm = itr.next()) { + result.add(elm); - if (tokenIndex != tokenExpansionSize && tokenIndex != 0) { + if(i != tokenExpansionSize) { result.add(operatorName); - result.add(token); - } else { - result.add(token); } - }); + } return result; } return new FunctionalList<>(tokenToSplit); } -} \ No newline at end of file +} -- cgit v1.2.3