From b65b705c391bb772bc41269bce5243c1cc88969d Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Fri, 22 Apr 2016 14:29:05 -0400 Subject: Formatting changes --- .../main/java/bjc/utils/parserutils/RuleBasedConfigReader.java | 4 ++-- .../src/main/java/bjc/utils/parserutils/ShuntingYard.java | 10 ++++++---- .../src/main/java/bjc/utils/parserutils/TokenTransformer.java | 9 ++++----- .../src/main/java/bjc/utils/parserutils/TreeConstructor.java | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils') diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java index c31066c..a2fc34b 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java @@ -115,8 +115,8 @@ public class RuleBasedConfigReader { } private boolean startRule(E state, boolean ruleOpen, String line) { - FunctionalStringTokenizer tokenizer = - new FunctionalStringTokenizer(line, " "); + FunctionalStringTokenizer tokenizer = new FunctionalStringTokenizer( + line, " "); String nextToken = tokenizer.nextToken(); diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java index 0e34b97..636bf31 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/ShuntingYard.java @@ -107,7 +107,9 @@ public class ShuntingYard { /** * Create a new shunting yard with a default set of operators - * @param configureBasics Whether or not basic math operators should be provided + * + * @param configureBasics + * Whether or not basic math operators should be provided */ public ShuntingYard(boolean configureBasics) { operators = new FunctionalMap<>(); @@ -157,9 +159,9 @@ public class ShuntingYard { return false; } - boolean hasHigherPrecedence = - operators.get(rightOperator).getPrecedence() >= operators - .get(leftOperator).getPrecedence(); + boolean hasHigherPrecedence = operators.get(rightOperator) + .getPrecedence() >= operators.get(leftOperator) + .getPrecedence(); return hasHigherPrecedence; } diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java index c88763f..4727124 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java @@ -11,7 +11,6 @@ import bjc.utils.data.IPair; import bjc.utils.data.Pair; import bjc.utils.funcdata.ITree; import bjc.utils.funcdata.Tree; -import bjc.utils.funcutils.StringUtils; final class TokenTransformer implements Consumer { private final class OperatorHandler @@ -23,15 +22,15 @@ final class TokenTransformer implements Consumer { } @Override - public IPair>, ITree> - apply(IPair>, ITree> pair) { + public IPair>, ITree> apply( + IPair>, ITree> pair) { return pair.bind((queuedASTs, currentAST) -> { return handleOperator(queuedASTs); }); } - private IPair>, ITree> - handleOperator(Deque> queuedASTs) { + private IPair>, ITree> handleOperator( + Deque> queuedASTs) { ITree newAST; if (isSpecialOperator.test(element)) { diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java index 152d4d9..2d2a69e 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java @@ -76,8 +76,8 @@ public class TreeConstructor { "Special operator determiner must not be null"); } - IHolder>, ITree>> initialState = - new Identity<>(new Pair<>(new LinkedList<>(), null)); + IHolder>, ITree>> initialState = new Identity<>( + new Pair<>(new LinkedList<>(), null)); tokens.forEach( new TokenTransformer<>(initialState, operatorPredicate, -- cgit v1.2.3