From 27bf571d6413c3cc6a5d664b5bddd38d21d7b1cd Mon Sep 17 00:00:00 2001 From: EVE Date: Mon, 13 Mar 2017 16:42:21 -0400 Subject: Formatting --- .../bjc/utils/parserutils/TokenTransformer.java | 42 +++++++++------------- 1 file changed, 17 insertions(+), 25 deletions(-) (limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java') 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 9953c00..1a4a6c4 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TokenTransformer.java @@ -14,8 +14,7 @@ import bjc.utils.data.Tree; final class TokenTransformer implements Consumer { // Handle operators - private final class OperatorHandler implements UnaryOperator< - IPair>, ITree>> { + private final class OperatorHandler implements UnaryOperator>, ITree>> { private TokenType element; public OperatorHandler(TokenType element) { @@ -25,24 +24,24 @@ final class TokenTransformer implements Consumer { @Override public IPair>, ITree> apply( IPair>, ITree> pair) { - // Replace the current AST with the result of handling an operator + // Replace the current AST with the result of handling + // an operator return pair.bindLeft((queuedASTs) -> { return handleOperator(queuedASTs); }); } - private IPair>, - ITree> handleOperator( - Deque> queuedASTs) { + private IPair>, ITree> handleOperator( + Deque> queuedASTs) { // The AST we're going to hand back ITree newAST; // Handle special operators if (isSpecialOperator.test(element)) { - newAST = handleSpecialOperator.apply(element) - .apply(queuedASTs); + newAST = handleSpecialOperator.apply(element).apply(queuedASTs); } else { - // Error if we don't have enough for a binary operator + // Error if we don't have enough for a binary + // operator if (queuedASTs.size() < 2) { throw new IllegalStateException( "Attempted to parse binary operator without enough operands.\n" @@ -67,25 +66,17 @@ final class TokenTransformer implements Consumer { } } - private IHolder>, - ITree>> initialState; + private IHolder>, ITree>> initialState; - private Predicate< - TokenType> operatorPredicate; + private Predicate operatorPredicate; - private Predicate< - TokenType> isSpecialOperator; - private Function>, - ITree>> handleSpecialOperator; + private Predicate isSpecialOperator; + private Function>, ITree>> handleSpecialOperator; // Create a new transformer - public TokenTransformer( - IHolder>, - ITree>> initialState, - Predicate operatorPredicate, - Predicate isSpecialOperator, - Function>, - ITree>> handleSpecialOperator) { + public TokenTransformer(IHolder>, ITree>> initialState, + Predicate operatorPredicate, Predicate isSpecialOperator, + Function>, ITree>> handleSpecialOperator) { this.initialState = initialState; this.operatorPredicate = operatorPredicate; this.isSpecialOperator = isSpecialOperator; @@ -102,7 +93,8 @@ final class TokenTransformer implements Consumer { // Insert the new tree into the AST initialState.transform((pair) -> { - // Transform the pair, ignoring the current AST in favor of the + // Transform the pair, ignoring the current AST + // in favor of the // one consisting of the current element return pair.bindLeft((queue) -> { queue.push(newAST); -- cgit v1.2.3