diff options
| author | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-04-13 23:11:36 -0400 |
|---|---|---|
| committer | bculkin2442 <bjculkin@mix.wvu.edu> | 2016-04-13 23:11:36 -0400 |
| commit | 9adff31e86603493c2a245e1e803d951675d5e00 (patch) | |
| tree | 7374a6e4657333881db5621fbf23e18617470329 /BJC-Utils2/src/main/java/bjc/utils/parserutils | |
| parent | ba07771f8333f1b098ab8a9ec9fec886b72b9cc0 (diff) | |
Implemented new tree abstraction
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc/utils/parserutils')
3 files changed, 11 insertions, 10 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java b/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java index b6c4d8c..4625807 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/AST.java @@ -6,7 +6,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.UnaryOperator; -import bjc.utils.funcdata.bst.ITreePart.TreeLinearizationMethod; +import bjc.utils.funcdata.bst.TreeLinearizationMethod; /** * A simple binary tree meant for use as an AST 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 999503c..9bb20a5 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/RuleBasedConfigReader.java @@ -8,8 +8,8 @@ import java.util.Scanner; import java.util.function.BiConsumer; import java.util.function.Consumer; -import bjc.utils.data.IPair; -import bjc.utils.data.Pair; +import bjc.utils.data.experimental.IPair; +import bjc.utils.data.experimental.Pair; import bjc.utils.exceptions.UnknownPragmaException; import bjc.utils.funcdata.FunctionalStringTokenizer; 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 3252351..088430b 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java +++ b/BJC-Utils2/src/main/java/bjc/utils/parserutils/TreeConstructor.java @@ -5,11 +5,12 @@ import java.util.LinkedList; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; +import java.util.function.UnaryOperator; -import bjc.utils.data.GenHolder; -import bjc.utils.data.IHolder; -import bjc.utils.data.IPair; -import bjc.utils.data.Pair; +import bjc.utils.data.experimental.IHolder; +import bjc.utils.data.experimental.IPair; +import bjc.utils.data.experimental.Identity; +import bjc.utils.data.experimental.Pair; import bjc.utils.funcdata.IFunctionalList; /** @@ -20,8 +21,8 @@ import bjc.utils.funcdata.IFunctionalList; */ public class TreeConstructor { private static final class TokenTransformer<T> implements Consumer<T> { - private final class OperatorHandler implements - Function<IPair<Deque<AST<T>>, AST<T>>, IPair<Deque<AST<T>>, AST<T>>> { + private final class OperatorHandler + implements UnaryOperator<IPair<Deque<AST<T>>, AST<T>>> { private T element; public OperatorHandler(T element) { @@ -158,7 +159,7 @@ public class TreeConstructor { "Special operator determiner must not be null"); } - IHolder<IPair<Deque<AST<T>>, AST<T>>> initialState = new GenHolder<>( + IHolder<IPair<Deque<AST<T>>, AST<T>>> initialState = new Identity<>( new Pair<>(new LinkedList<>(), null)); tokens.forEach( |